45 lines
2.3 KiB
Diff
45 lines
2.3 KiB
Diff
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
|
|
index 4cce9ca9fbf1..b1d578c0f8c2 100644
|
|
--- chrome/browser/profiles/profile_manager.cc
|
|
+++ chrome/browser/profiles/profile_manager.cc
|
|
@@ -388,7 +388,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
|
|
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 257e27caed9f..4d0c4fe116c6 100644
|
|
--- chrome/browser/profiles/profile_manager.h
|
|
+++ chrome/browser/profiles/profile_manager.h
|
|
@@ -92,7 +92,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 total number of profiles available on this machine.
|
|
size_t GetNumberOfProfiles();
|
|
@@ -122,7 +122,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.
|
|
@@ -131,7 +131,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.
|