diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-10 03:44:28 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-10 03:44:28 +0000 |
| commit | 7237bfcc6ded653b4ae2defaee6f1303b1744ede (patch) | |
| tree | 532c17c7fcb634b20a694ccf2112b2fdae2c31c5 /chrome/browser/ui/webui | |
| parent | c1527c043279d616ae78f71ba4117d3979fc5fcb (diff) | |
| download | chromium_src-7237bfcc6ded653b4ae2defaee6f1303b1744ede.zip chromium_src-7237bfcc6ded653b4ae2defaee6f1303b1744ede.tar.gz chromium_src-7237bfcc6ded653b4ae2defaee6f1303b1744ede.tar.bz2 | |
Multi-Profiles: Enable multi-profiles by default for views ui
With this change mult-profiles is enabled by default for views ui.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7329034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui')
| -rw-r--r-- | chrome/browser/ui/webui/chrome_web_ui_factory.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/personal_options_handler.cc | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/ui/webui/chrome_web_ui_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_factory.cc index fc0e6bb..8991b19 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_factory.cc @@ -11,6 +11,7 @@ #include "chrome/browser/extensions/extensions_ui.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/webui/bookmarks_ui.h" #include "chrome/browser/ui/webui/bug_report_ui.h" #include "chrome/browser/ui/webui/constrained_html_ui.h" @@ -228,7 +229,7 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile, return &NewWebUI<ConstrainedHtmlUI>; #if !defined(OS_CHROMEOS) - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles)) { + if (ProfileManager::IsMultipleProfilesEnabled()) { if (url.host() == chrome::kChromeUINewProfileHost) return &NewWebUI<NewProfileUI>; } diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc index 705af76..3a6338c 100644 --- a/chrome/browser/ui/webui/options/personal_options_handler.cc +++ b/chrome/browser/ui/webui/options/personal_options_handler.cc @@ -8,7 +8,6 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/command_line.h" #include "base/path_service.h" #include "base/stl_util-inl.h" #include "base/stringprintf.h" @@ -48,8 +47,7 @@ #endif // defined(TOOLKIT_GTK) PersonalOptionsHandler::PersonalOptionsHandler() { - const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); - multiprofile_ = browser_command_line.HasSwitch(switches::kMultiProfiles); + multiprofile_ = ProfileManager::IsMultipleProfilesEnabled(); #if defined(OS_CHROMEOS) registrar_.Add(this, NotificationType::LOGIN_USER_IMAGE_CHANGED, |