Multi-Profile: Move multi-profile commands from wrench menu to avatar menu

chrome/browser/ui/toolbar/wrench_menu_model.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
-#include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_info_cache.h"
-#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/profiling.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_source.h"
 #include "content/common/notification_type.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/button_menu_item_model.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #endif
 
-#if defined(OS_MACOSX)
-#include "chrome/browser/ui/browser_window.h"
-#endif
-
 #if defined(OS_WIN)
 #include "chrome/browser/enumerate_modules_model_win.h"
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // EncodingMenuModel
 
 EncodingMenuModel::EncodingMenuModel(Browser* browser)
     : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
       browser_(browser) {
@@ skipping 145 matching lines @@
 #endif
 #if defined(OS_MACOSX) || defined(TOOLKIT_VIEWS)
   AddSeparator();
 #else
   // TODO: add submenu for bookmarks themselves, restore separator.
 #endif
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// ProfilesSubMenuModel
-
-ProfilesSubMenuModel::ProfilesSubMenuModel(
-    ui::SimpleMenuModel::Delegate* delegate, Browser* browser)
-    : SimpleMenuModel(this),
-      browser_(browser),
-      delegate_(delegate) {
-  Build();
-}
-
-void ProfilesSubMenuModel::Build() {
-  ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  size_t count = cache.GetNumberOfProfiles();
-  for (size_t i = 0; i < count; ++i) {
-    AddCheckItem(COMMAND_SWITCH_TO_PROFILE + i,
-                 cache.GetNameOfProfileAtIndex(i));
-  }
-
-  AddSeparator();
-
-  const string16 short_product_name =
-      l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME);
-  AddItem(IDC_CREATE_NEW_PROFILE, l10n_util::GetStringFUTF16(
-      IDS_PROFILES_CREATE_NEW_PROFILE_OPTION, short_product_name));
-}
-
-class ProfileSwitchObserver : public ProfileManagerObserver {
-  virtual void OnProfileCreated(Profile* profile) OVERRIDE {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-    Browser* browser = BrowserList::FindTabbedBrowser(profile, false);
-    if (browser)
-      browser->window()->Activate();
-    else
-      Browser::NewWindowWithProfile(profile);
-  }
-
-  virtual bool DeleteAfterCreation() OVERRIDE { return true; }
-};
-
-void ProfilesSubMenuModel::ExecuteCommand(int command_id) {
-  ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  size_t index = command_id;
-  if (index < cache.GetNumberOfProfiles()) {
-    FilePath profile_path = cache.GetPathOfProfileAtIndex(index);
-    ProfileSwitchObserver* observer = new ProfileSwitchObserver;
-    // The observer is deleted by the manager when profile creation is finished.
-    g_browser_process->profile_manager()->CreateProfileAsync(
-        profile_path, observer);
-  } else {
-    delegate_->ExecuteCommand(command_id);
-  }
-}
-
-bool ProfilesSubMenuModel::IsCommandIdChecked(int command_id) const {
-  ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  size_t index = command_id;
-  if (index < cache.GetNumberOfProfiles()) {
-    FilePath userDataFolder;
-    PathService::Get(chrome::DIR_USER_DATA, &userDataFolder);
-    FilePath profile_path = cache.GetPathOfProfileAtIndex(index);
-    return browser_->GetProfile()->GetPath() == profile_path;
-  }
-  return delegate_->IsCommandIdChecked(command_id);
-}
-
-bool ProfilesSubMenuModel::IsCommandIdEnabled(int command_id) const {
-  ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  size_t index = command_id;
-  if (index < cache.GetNumberOfProfiles())
-    return true;
-  return delegate_->IsCommandIdEnabled(command_id);
-}
-
-bool ProfilesSubMenuModel::GetAcceleratorForCommandId(
-    int command_id,
-    ui::Accelerator* accelerator) {
-  ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  size_t index = command_id;
-  if (index < cache.GetNumberOfProfiles())
-    return false;
-  return delegate_->GetAcceleratorForCommandId(command_id, accelerator);
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // WrenchMenuModel
 
 WrenchMenuModel::WrenchMenuModel(ui::AcceleratorProvider* provider,
                                  Browser* browser)
     : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
       provider_(provider),
       browser_(browser),
       tabstrip_model_(browser_->tabstrip_model()) {
   Build();
   UpdateZoomControls();
@@ skipping 74 matching lines @@
         return true;
       }
     }
     default:
       break;
   }
   return false;
 }
 
 void WrenchMenuModel::ExecuteCommand(int command_id) {
-  switch (command_id) {
-    case IDC_CREATE_NEW_PROFILE:
-      ProfileManager::CreateMultiProfileAsync();
-      break;
-    default:
-      browser_->ExecuteCommand(command_id);
-      break;
-  }
+  browser_->ExecuteCommand(command_id);
 }
 
 bool WrenchMenuModel::IsCommandIdChecked(int command_id) const {
   if (command_id == IDC_SHOW_BOOKMARK_BAR) {
     return browser_->profile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
   } else if (command_id == IDC_PROFILING_ENABLED) {
     return Profiling::BeingProfiled();
   }
 
   return false;
 }
 
 bool WrenchMenuModel::IsCommandIdEnabled(int command_id) const {
   switch (command_id) {
     case IDC_SHOW_BOOKMARK_BAR:
       return !browser_->profile()->GetPrefs()->IsManagedPreference(
           prefs::kEnableBookmarkBar);
-    case IDC_CREATE_NEW_PROFILE:
-      return true;
-    case IDC_PROFILE_MENU:
-      return true;
     default:
       return browser_->command_updater()->IsCommandEnabled(command_id);
   }
 }
 
 bool WrenchMenuModel::IsCommandIdVisible(int command_id) const {
   if (command_id == IDC_UPGRADE_DIALOG) {
     return UpgradeDetector::GetInstance()->notify_upgrade();
   } else if (command_id == IDC_VIEW_INCOMPATIBILITIES) {
 #if defined(OS_WIN)
@@ skipping 118 matching lines @@
 
   AddSeparator();
 
   bookmark_sub_menu_model_.reset(new BookmarkSubMenuModel(this, browser_));
   AddSubMenuWithStringId(IDC_BOOKMARKS_MENU, IDS_BOOKMARKS_MENU,
                          bookmark_sub_menu_model_.get());
   AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY);
   AddItemWithStringId(IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS);
   AddSeparator();
 
-#if !defined(OS_CHROMEOS)
-  const string16 short_product_name =
-      l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME);
-  const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
-  if (browser_command_line.HasSwitch(switches::kMultiProfiles)) {
-    ProfileInfoCache& cache =
-        g_browser_process->profile_manager()->GetProfileInfoCache();
-    if (cache.GetNumberOfProfiles() > 1) {
-      profiles_sub_menu_model_.reset(new ProfilesSubMenuModel(this, browser_));
-      AddSubMenu(IDC_PROFILE_MENU, l10n_util::GetStringFUTF16(
-          IDS_PROFILES_MENU, short_product_name),
-          profiles_sub_menu_model_.get());
-    } else {
-      profiles_sub_menu_model_.reset();
-      AddItem(IDC_CREATE_NEW_PROFILE, l10n_util::GetStringFUTF16(
-          IDS_PROFILES_CREATE_NEW_PROFILE_OPTION, short_product_name));
-    }
-
-    AddSeparator();
-  }
-#endif
-
 #if defined(OS_CHROMEOS)
   AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS);
 #elif defined(OS_MACOSX)
   AddItemWithStringId(IDC_OPTIONS, IDS_PREFERENCES);
 #elif defined(TOOLKIT_USES_GTK)
   string16 preferences = gtk_util::GetStockPreferencesMenuLabel();
   if (!preferences.empty())
     AddItem(IDC_OPTIONS, preferences);
   else
     AddItemWithStringId(IDC_OPTIONS, IDS_PREFERENCES);
@@ skipping 72 matching lines @@
         &enable_increment, &enable_decrement);
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 string16 WrenchMenuModel::GetSyncMenuLabel() const {
   return sync_ui_util::GetSyncMenuLabel(
       browser_->profile()->GetOriginalProfile()->GetProfileSyncService());
 }