Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3370)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/profiles/profile_manager.cc

Issue 7780031: Fix sync test crashing when multiprofiles are enabled on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_manager.h ('k') | chrome/browser/sync/test/integration/sync_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_manager.cc
===================================================================
--- chrome/browser/profiles/profile_manager.cc (revision 100650)
+++ chrome/browser/profiles/profile_manager.cc (working copy)
@@ -573,9 +573,20 @@
// static
bool ProfileManager::IsMultipleProfilesEnabled() {
+#if defined(OS_MACOSX) || (defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS))
+ return true;
+#else
return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles);
+#endif
}
ProfileManagerWithoutInit::ProfileManagerWithoutInit(
const FilePath& user_data_dir) : ProfileManager(user_data_dir) {
}
+
+void ProfileManager::RegisterTestingProfile(Profile* profile,
+ bool addToCache) {
Robert Sesek 2011/09/12 14:02:16 Should be add_to_cache
+ RegisterProfile(profile, true);
+ if (addToCache)
+ AddProfileToCache(profile);
+}
« no previous file with comments | « chrome/browser/profiles/profile_manager.h ('k') | chrome/browser/sync/test/integration/sync_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698