diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 10:22:43 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 12:36:28 +0000 |
| commit | 271a6c3487a14599023a9106329505597638d793 (patch) | |
| tree | e040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc | |
| parent | 7b2ffa587235a47d4094787d72f38102089f402a (diff) | |
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc')
| -rw-r--r-- | chromium/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/chromium/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chromium/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc index 75d783e861b..eb9da3ee60f 100644 --- a/chromium/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +++ b/chromium/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc @@ -39,8 +39,8 @@ #include "chrome/common/web_application_info.h" #include "components/favicon/core/favicon_service.h" #include "content/public/browser/browser_context.h" +#include "content/public/browser/system_connector.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/service_manager_connection.h" #include "extensions/browser/api/management/management_api.h" #include "extensions/browser/api/management/management_api_constants.h" #include "extensions/browser/disable_reason.h" @@ -70,8 +70,7 @@ class ManagementSetEnabledFunctionInstallPromptDelegate const extensions::Extension* extension, const base::Callback<void(bool)>& callback) : install_prompt_(new ExtensionInstallPrompt(web_contents)), - callback_(callback), - weak_factory_(this) { + callback_(callback) { ExtensionInstallPrompt::PromptType type = ExtensionInstallPrompt::GetReEnablePromptTypeForExtension( browser_context, extension); @@ -97,7 +96,7 @@ class ManagementSetEnabledFunctionInstallPromptDelegate base::Callback<void(bool)> callback_; base::WeakPtrFactory<ManagementSetEnabledFunctionInstallPromptDelegate> - weak_factory_; + weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(ManagementSetEnabledFunctionInstallPromptDelegate); }; @@ -258,10 +257,10 @@ void ChromeManagementAPIDelegate::LaunchAppFunctionDelegate( // returned. extensions::LaunchContainer launch_container = GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension); - OpenApplication(AppLaunchParams(Profile::FromBrowserContext(context), - extension, launch_container, - WindowOpenDisposition::NEW_FOREGROUND_TAB, - extensions::SOURCE_MANAGEMENT_API)); + OpenApplication(AppLaunchParams( + Profile::FromBrowserContext(context), extension->id(), launch_container, + WindowOpenDisposition::NEW_FOREGROUND_TAB, + extensions::AppLaunchSource::kSourceManagementApi)); #if defined(OS_CHROMEOS) chromeos::DemoSession::RecordAppLaunchSourceIfInDemoMode( @@ -288,8 +287,7 @@ void ChromeManagementAPIDelegate:: extensions::ManagementGetPermissionWarningsByManifestFunction* function, const std::string& manifest_str) const { data_decoder::SafeJsonParser::Parse( - content::ServiceManagerConnection::GetForProcess()->GetConnector(), - manifest_str, + content::GetSystemConnector(), manifest_str, base::BindOnce( &extensions::ManagementGetPermissionWarningsByManifestFunction:: OnParseSuccess, |