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

chrome/browser/ui/views/frame/browser_view.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/views/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 459 matching lines @@
   return browser_->profile()->IsOffTheRecord();
 }
 
 bool BrowserView::ShouldShowAvatar() const {
   if (!IsBrowserTypeNormal())
     return false;
   if (IsOffTheRecord())
     return true;
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles)) {
-    ProfileInfoCache& cache =
-        g_browser_process->profile_manager()->GetProfileInfoCache();
-    if (cache.GetNumberOfProfiles() > 1)
-      return true;
+    // 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;
   }
 
   return false;
 }
 
 bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) {
 #if defined(OS_CHROMEOS)
   // If accessibility is enabled, stop speech and return false so that key
   // combinations involving Search can be used for extra accessibility
   // functionality.
@@ skipping 2143 matching lines @@
   view->GetWidget()->non_client_view()->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }