Multi-Profiles: Enable multi-profiles by default for views ui

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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=91970

[Nico, 2011-07-09 00:49:58]

Are you missing this one:
http://codesearch.google.com/codesearch#OAMlx_jo-ck/src/chrome/browser/ui/too...
?

On Fri, Jul 8, 2011 at 4:46 PM,  <sail@chromium.org> wrote:
> Reviewers: Miranda Callahan, rsesek, Nico,
>
> Description:
> 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
>
>
> Please review this at http://codereview.chromium.org/7329034/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
>  M chrome/browser/about_flags.cc
>  M chrome/browser/browser_main.cc
>  M chrome/browser/profiles/profile_manager.h
>  M chrome/browser/profiles/profile_manager.cc
>  M chrome/browser/sync/sync_ui_util.cc
>  M chrome/browser/ui/cocoa/browser_window_controller.mm
>  M chrome/browser/ui/gtk/browser_titlebar.cc
>  M chrome/browser/ui/views/frame/browser_view.cc
>  M chrome/browser/ui/webui/chrome_web_ui_factory.cc
>  M chrome/browser/ui/webui/options/personal_options_handler.cc
>
>
> Index: chrome/browser/about_flags.cc
> diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
> index
>
1d0894b6cffc5e8715e24e2c2cec4a12f3c574e1..2e70ac27457dd689c690dbea9d9457f02ce571ac
> 100644
> --- a/chrome/browser/about_flags.cc
> +++ b/chrome/browser/about_flags.cc
> @@ -294,7 +294,7 @@ const Experiment kExperiments[] = {
>     "multi-profiles",
>     IDS_FLAGS_MULTI_PROFILES_NAME,
>     IDS_FLAGS_MULTI_PROFILES_DESCRIPTION,
> -    kOsMac | kOsWin | kOsLinux,  // This switch is not available in CrOS.
> +    kOsMac | kOsLinux,  // This switch is not available in CrOS.
>     SINGLE_VALUE_TYPE(switches::kMultiProfiles)
>   },
>   {
> Index: chrome/browser/browser_main.cc
> diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
> index
>
d31fe38d8e6fe6a9f2d86bfad5ebebf6eddb2ca7..4b1bd9db3c21d4b78da82abfaaa88d057a3f42e3
> 100644
> --- a/chrome/browser/browser_main.cc
> +++ b/chrome/browser/browser_main.cc
> @@ -900,8 +900,7 @@ void InitializeBrokerServices(const MainFunctionParams&
> parameters,
>  // should not continue.
>  Profile* CreateProfile(const MainFunctionParams& parameters,
>                        const FilePath& user_data_dir) {
> -  const CommandLine& browser_command_line =
> *CommandLine::ForCurrentProcess();
> -  Profile* profile =
> browser_command_line.HasSwitch(switches::kMultiProfiles) ?
> +  Profile* profile = ProfileManager::IsMultipleProfilesEnabled() ?
>
> g_browser_process->profile_manager()->GetLastUsedProfile(user_data_dir) :
>
> g_browser_process->profile_manager()->GetDefaultProfile(user_data_dir);
>   if (profile)
> Index: chrome/browser/profiles/profile_manager.cc
> diff --git a/chrome/browser/profiles/profile_manager.cc
> b/chrome/browser/profiles/profile_manager.cc
> index
>
f0f5f44b6ae23158cde92afc31c474bd641baf76..a771b3b6a3db751b682443ba742a404a85332bdd
> 100644
> --- a/chrome/browser/profiles/profile_manager.cc
> +++ b/chrome/browser/profiles/profile_manager.cc
> @@ -566,3 +566,12 @@ void ProfileManager::ScheduleProfileForDeletion(const
> FilePath& profile_dir) {
>   ProfileInfoCache& cache = GetProfileInfoCache();
>   cache.DeleteProfileFromCache(profile_dir);
>  }
> +
> +// static
> +bool ProfileManager::IsMultipleProfilesEnabled() {
> +#if defined(TOOLKIT_VIEWS)
> +  return true;
> +#else
> +  return
> CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles);
> +#endif
> +}
> Index: chrome/browser/profiles/profile_manager.h
> diff --git a/chrome/browser/profiles/profile_manager.h
> b/chrome/browser/profiles/profile_manager.h
> index
>
088388a6ac8d8fea42b8987db3ce042675b3ed65..c369b44622415326a5e3a5a5f67459539068a221
> 100644
> --- a/chrome/browser/profiles/profile_manager.h
> +++ b/chrome/browser/profiles/profile_manager.h
> @@ -155,6 +155,9 @@ class ProfileManager : public base::NonThreadSafe,
>   // Schedules the profile at the given path to be deleted on shutdown.
>   void ScheduleProfileForDeletion(const FilePath& profile_dir);
>
> +  // Checks if multiple profiles is enabled.
> +  static bool IsMultipleProfilesEnabled();
> +
>  protected:
>   // Does final initial actions.
>   virtual void DoFinalInit(Profile* profile);
> Index: chrome/browser/sync/sync_ui_util.cc
> diff --git a/chrome/browser/sync/sync_ui_util.cc
> b/chrome/browser/sync/sync_ui_util.cc
> index
>
24a3de826219b6425eaee17cf9ca4f44a76e7ab7..513f8b944928252d2728f48af6448e31263ec38e
> 100644
> --- a/chrome/browser/sync/sync_ui_util.cc
> +++ b/chrome/browser/sync/sync_ui_util.cc
> @@ -4,12 +4,12 @@
>
>  #include "chrome/browser/sync/sync_ui_util.h"
>
> -#include "base/command_line.h"
>  #include "base/i18n/number_formatting.h"
>  #include "base/i18n/time_formatting.h"
>  #include "base/string_util.h"
>  #include "base/utf_string_conversions.h"
>  #include "chrome/browser/profiles/profile.h"
> +#include "chrome/browser/profiles/profile_manager.h"
>  #include "chrome/browser/sync/profile_sync_service.h"
>  #include "chrome/browser/sync/protocol/proto_enum_conversions.h"
>  #include "chrome/browser/sync/sessions/session_state.h"
> @@ -76,9 +76,8 @@ string16 GetSyncedStateStatusLabel(ProfileSyncService*
> service) {
>   if (user_name.empty())
>     return label;
>
> -  const CommandLine& browser_command_line =
> *CommandLine::ForCurrentProcess();
>   return l10n_util::GetStringFUTF16(
> -      browser_command_line.HasSwitch(switches::kMultiProfiles) ?
> +      ProfileManager::IsMultipleProfilesEnabled() ?
>           IDS_PROFILES_SYNCED_TO_USER_WITH_TIME :
>           IDS_SYNC_ACCOUNT_SYNCED_TO_USER_WITH_TIME,
>       user_name,
> Index: chrome/browser/ui/cocoa/browser_window_controller.mm
> diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm
> b/chrome/browser/ui/cocoa/browser_window_controller.mm
> index
>
6283dba7eee7f42750f5059c2df611dae3553924..380b36a43a41b53968fcb1007a5e847626cd374f
> 100644
> --- a/chrome/browser/ui/cocoa/browser_window_controller.mm
> +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
> @@ -15,6 +15,7 @@
>  #include "chrome/browser/google/google_util.h"
>  #include "chrome/browser/instant/instant_controller.h"
>  #include "chrome/browser/profiles/profile.h"
> +#include "chrome/browser/profiles/profile_manager.h"
>  #include "chrome/browser/sync/profile_sync_service.h"
>  #include "chrome/browser/sync/sync_ui_util_mac.h"
>  #include "chrome/browser/tab_contents/tab_contents_view_mac.h"
> @@ -1310,7 +1311,7 @@
>
>  - (BOOL)shouldShowAvatar {
>   return [self hasTabStrip] && (browser_->profile()->IsOffTheRecord() ||
> -
>  CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles));
> +
>  ProfileManager::IsMultipleProfilesEnabled());
>  }
>
>  - (BOOL)isBookmarkBarVisible {
> Index: chrome/browser/ui/gtk/browser_titlebar.cc
> diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc
> b/chrome/browser/ui/gtk/browser_titlebar.cc
> index
>
6f4a8d79fc6dfeece85d5f145fda75e337a28fdb..b3c1d43f6558204300af495a7799d577bc5c27f0
> 100644
> --- a/chrome/browser/ui/gtk/browser_titlebar.cc
> +++ b/chrome/browser/ui/gtk/browser_titlebar.cc
> @@ -18,6 +18,7 @@
>  #include "chrome/app/chrome_command_ids.h"
>  #include "chrome/browser/prefs/pref_service.h"
>  #include "chrome/browser/profiles/profile.h"
> +#include "chrome/browser/profiles/profile_manager.h"
>  #include "chrome/browser/ui/browser.h"
>  #include "chrome/browser/ui/gtk/accelerators_gtk.h"
>  #include "chrome/browser/ui/gtk/browser_window_gtk.h"
> @@ -309,8 +310,7 @@ void BrowserTitlebar::Init() {
>
>   // If multi-profile is enabled set up profile button and login
> notifications.
>   // The button lives in its own vbox in container_hbox_.
> -  const CommandLine& browser_command_line =
> *CommandLine::ForCurrentProcess();
> -  if (browser_command_line.HasSwitch(switches::kMultiProfiles) &&
> +  if (ProfileManager::IsMultipleProfilesEnabled() &&
>       !browser_window_->browser()->profile()->IsOffTheRecord()) {
>     PrefService* prefs = browser_window_->browser()->profile()->GetPrefs();
>     usernamePref_.Init(prefs::kGoogleServicesUsername, prefs, this);
> Index: chrome/browser/ui/views/frame/browser_view.cc
> diff --git a/chrome/browser/ui/views/frame/browser_view.cc
> b/chrome/browser/ui/views/frame/browser_view.cc
> index
>
95bcc14a0719291e3c3a0e511425368a2b7e14de..556af6096351adf7d4a1fda5d79ef5760983293d
> 100644
> --- a/chrome/browser/ui/views/frame/browser_view.cc
> +++ b/chrome/browser/ui/views/frame/browser_view.cc
> @@ -476,7 +476,7 @@ bool BrowserView::ShouldShowAvatar() const {
>   if (IsOffTheRecord())
>     return true;
>
> -  if
> (CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles)) {
> +  if (ProfileManager::IsMultipleProfilesEnabled()) {
>     // TODO(sail): Once the multi-profile options UI is done we only want to
>     // show the avatar if the user has more than one profile.
>     return true;
> Index: chrome/browser/ui/webui/chrome_web_ui_factory.cc
> diff --git a/chrome/browser/ui/webui/chrome_web_ui_factory.cc
> b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
> index
>
fc0e6bb7f914c52915b3fad2f2e79f0d8a02c123..8991b19947f0e690b986ec27df3a86a7ba2951d0
> 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>;
>   }
> Index: chrome/browser/ui/webui/options/personal_options_handler.cc
> diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc
> b/chrome/browser/ui/webui/options/personal_options_handler.cc
> index
>
705af76665c46c0d3f74862dbe72aea15ebe2e76..3a6338cfe01a59b01bd23d5a3085a043d73735be
> 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,
>
>
>

[sail, 2011-07-09 03:17:35]

The wrench menu code is gone on tip of tree

[Miranda Callahan, 2011-07-09 13:28:44]

On 2011/07/09 03:17:35, sail wrote:
> The wrench menu code is gone on tip of tree

LGTM!

[sail, 2011-07-09 18:04:47]

I realized that enabling it for views might also enable it for cros. I added an
explicit #if !defined(OS_CHROMEOS)