Only showing the new multi user menus when there are at least 2 suitable users known to the system

chrome/browser/profiles/avatar_menu_model.cc

 // Copyright (c) 2012 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/profiles/avatar_menu_model.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/avatar_menu_model_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/signin/signin_promo.h"
+#include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 228 matching lines @@
 // static
 bool AvatarMenuModel::ShouldShowAvatarMenu() {
   if (base::FieldTrialList::FindFullName(kShowProfileSwitcherFieldTrialName) ==
       kAlwaysShowSwitcherGroupName) {
     // We should only be in this group when multi-profiles is enabled.
     DCHECK(profiles::IsMultipleProfilesEnabled());
     return true;
   }
   if (profiles::IsMultipleProfilesEnabled()) {
 #if defined(OS_CHROMEOS)
-    // On ChromeOS we can always show this menu.
-    // TODO(skuhne):  For now show this menu even if there is a single profile.
-    // This will have to change once we work out the right way to determine if
-    // the multi profile UX should be displayed.
-    return true;
+    // On ChromeOS the menu will be always visible when it is possible to have
+    // two users logged in at the same time.
+    return ChromeShellDelegate::instance() &&
+           ChromeShellDelegate::instance()->IsMultiProfilesEnabled();
 #else
     return profiles::IsNewProfileManagementEnabled() ||
            (g_browser_process->profile_manager() &&
             g_browser_process->profile_manager()->GetNumberOfProfiles() > 1);
 #endif
   }
   return false;
 }
 
 void AvatarMenuModel::RebuildMenu() {
@@ skipping 59 matching lines @@
   contents->GetController().LoadURL(
     logout_url, content::Referrer(),
     content::PAGE_TRANSITION_GENERATED, std::string());
 
   // This object may be destructed when the menu closes but we need something
   // around to finish the sign-out process and close the profile windows.
   new SignoutTracker(current_profile, GURL(landing_url), contents);
 
   return contents;  // returned for testing purposes
 }