diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-13 15:05:36 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-14 10:33:47 +0000 |
commit | e684a3455bcc29a6e3e66a004e352dea4e1141e7 (patch) | |
tree | d55b4003bde34d7d05f558f02cfd82b2a66a7aac /chromium/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc | |
parent | 2b94bfe47ccb6c08047959d1c26e392919550e86 (diff) | |
download | qtwebengine-chromium-e684a3455bcc29a6e3e66a004e352dea4e1141e7.tar.gz |
BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0
Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc')
-rw-r--r-- | chromium/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chromium/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index b6513e4f758..b7582a64126 100644 --- a/chromium/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chromium/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc @@ -26,13 +26,12 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" -#include "chrome/browser/signin/signin_manager_factory.h" +#include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/ui/app_list/app_list_util.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" #include "components/crx_file/id_util.h" #include "components/prefs/pref_service.h" -#include "components/signin/core/browser/signin_manager.h" #include "content/public/browser/gpu_feature_checker.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" @@ -42,6 +41,7 @@ #include "extensions/common/extension.h" #include "net/base/load_flags.h" #include "net/url_request/url_request.h" +#include "services/identity/public/cpp/identity_manager.h" #include "url/gurl.h" #if BUILDFLAG(ENABLE_SUPERVISED_USERS) @@ -253,10 +253,10 @@ WebstorePrivateBeginInstallWithManifest3Function::Run() { void WebstorePrivateBeginInstallWithManifest3Function::OnWebstoreParseSuccess( const std::string& id, const SkBitmap& icon, - base::DictionaryValue* parsed_manifest) { + std::unique_ptr<base::DictionaryValue> parsed_manifest) { CHECK_EQ(details().id, id); CHECK(parsed_manifest); - parsed_manifest_.reset(parsed_manifest); + parsed_manifest_ = std::move(parsed_manifest); icon_ = icon; std::string localized_name = @@ -526,9 +526,9 @@ WebstorePrivateGetBrowserLoginFunction:: ExtensionFunction::ResponseAction WebstorePrivateGetBrowserLoginFunction::Run() { GetBrowserLogin::Results::Info info; - info.login = SigninManagerFactory::GetForProfile( + info.login = IdentityManagerFactory::GetForProfile( chrome_details_.GetProfile()->GetOriginalProfile()) - ->GetAuthenticatedAccountInfo() + ->GetPrimaryAccountInfo() .email; return RespondNow(ArgumentList(GetBrowserLogin::Results::Create(info))); } |