72 lines
3.5 KiB
Diff
72 lines
3.5 KiB
Diff
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
|
|
index 9b9335369a4f..fea76956bd41 100644
|
|
--- chrome/browser/profiles/profile_manager.cc
|
|
+++ chrome/browser/profiles/profile_manager.cc
|
|
@@ -374,7 +374,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
|
|
registrar_.Add(this, chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED,
|
|
content::NotificationService::AllSources());
|
|
|
|
- if (ProfileShortcutManager::IsFeatureEnabled() && !user_data_dir_.empty())
|
|
+ if (!user_data_dir_.empty() && ProfileShortcutManager::IsFeatureEnabled())
|
|
profile_shortcut_manager_ = ProfileShortcutManager::Create(this);
|
|
}
|
|
|
|
diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
|
|
index 93571e419253..bc77bebce943 100644
|
|
--- chrome/browser/profiles/profile_manager.h
|
|
+++ chrome/browser/profiles/profile_manager.h
|
|
@@ -101,7 +101,7 @@ class ProfileManager : public content::NotificationObserver,
|
|
// acceptable. Returns null if creation of the new profile fails.
|
|
// TODO(bauerb): Migrate calls from other code to GetProfileByPath(), then
|
|
// make this method private.
|
|
- Profile* GetProfile(const base::FilePath& profile_dir);
|
|
+ virtual Profile* GetProfile(const base::FilePath& profile_dir);
|
|
|
|
// Returns regular or off-the-record profile given its profile key.
|
|
static Profile* GetProfileFromProfileKey(ProfileKey* profile_key);
|
|
@@ -134,7 +134,7 @@ class ProfileManager : public content::NotificationObserver,
|
|
|
|
// Returns true if the profile pointer is known to point to an existing
|
|
// profile.
|
|
- bool IsValidProfile(const void* profile);
|
|
+ virtual bool IsValidProfile(const void* profile);
|
|
|
|
// Returns the directory where the first created profile is stored,
|
|
// relative to the user data directory currently in use.
|
|
@@ -143,7 +143,7 @@ class ProfileManager : public content::NotificationObserver,
|
|
// Get the Profile last used (the Profile to which owns the most recently
|
|
// focused window) with this Chrome build. If no signed profile has been
|
|
// stored in Local State, hand back the Default profile.
|
|
- Profile* GetLastUsedProfile(const base::FilePath& user_data_dir);
|
|
+ virtual Profile* GetLastUsedProfile(const base::FilePath& user_data_dir);
|
|
|
|
// Get the path of the last used profile, or if that's undefined, the default
|
|
// profile.
|
|
diff --git chrome/browser/profiles/renderer_updater.cc chrome/browser/profiles/renderer_updater.cc
|
|
index 4eb91c80e57a..02373b149bde 100644
|
|
--- chrome/browser/profiles/renderer_updater.cc
|
|
+++ chrome/browser/profiles/renderer_updater.cc
|
|
@@ -7,6 +7,7 @@
|
|
#include <utility>
|
|
|
|
#include "base/bind.h"
|
|
+#include "cef/libcef/features/runtime.h"
|
|
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
|
|
#include "chrome/browser/profiles/profile.h"
|
|
#include "chrome/browser/signin/identity_manager_factory.h"
|
|
@@ -57,8 +58,12 @@ void GetGuestViewDefaultContentSettingRules(
|
|
|
|
RendererUpdater::RendererUpdater(Profile* profile)
|
|
: profile_(profile), identity_manager_observer_(this) {
|
|
- identity_manager_ = IdentityManagerFactory::GetForProfile(profile);
|
|
- identity_manager_observer_.Add(identity_manager_);
|
|
+ if (cef::IsAlloyRuntimeEnabled()) {
|
|
+ identity_manager_ = nullptr;
|
|
+ } else {
|
|
+ identity_manager_ = IdentityManagerFactory::GetForProfile(profile);
|
|
+ identity_manager_observer_.Add(identity_manager_);
|
|
+ }
|
|
#if defined(OS_CHROMEOS)
|
|
oauth2_login_manager_ =
|
|
chromeos::OAuth2LoginManagerFactory::GetForProfile(profile_);
|