diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-14 22:44:13 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-14 22:44:13 +0000 |
| commit | 5d7a8757c73ead1497462c86070ec2b7d53662ef (patch) | |
| tree | eadff6e04b2ee0d915ef914d0e70150e8daf2972 | |
| parent | 8412a04f7e220a6fdf68f63cc363cfe56caaa280 (diff) | |
| download | chromium_src-5d7a8757c73ead1497462c86070ec2b7d53662ef.zip chromium_src-5d7a8757c73ead1497462c86070ec2b7d53662ef.tar.gz chromium_src-5d7a8757c73ead1497462c86070ec2b7d53662ef.tar.bz2 | |
Enable multiprofiles by default on Mac and Windows.
BUG=60105
TEST=none
Review URL: http://codereview.chromium.org/7861025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101176 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/about_flags.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/profiles/profile_manager.cc | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 5f56dd3..4df2c06 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -271,7 +271,7 @@ const Experiment kExperiments[] = { "multi-profiles", IDS_FLAGS_MULTI_PROFILES_NAME, IDS_FLAGS_MULTI_PROFILES_DESCRIPTION, - kOsWin | kOsMac | kOsLinux, // This switch is not available in CrOS. + kOsLinux, // This switch is not available in CrOS. SINGLE_VALUE_TYPE(switches::kMultiProfiles) }, { diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index 956d37a..3586a41 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -570,7 +570,11 @@ void ProfileManager::ScheduleProfileForDeletion(const FilePath& profile_dir) { // 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( |