Allow signin to continue even if sync is disabled by policy.

chrome/browser/ui/toolbar/wrench_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/ui/toolbar/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.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_manager.h"
-#include "chrome/browser/signin/signin_global_error.h"
-#include "chrome/browser/signin/signin_manager.h"
-#include "chrome/browser/signin/signin_manager_factory.h"
-#include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/sync/profile_sync_service_factory.h"
-#include "chrome/browser/sync/sync_global_error.h"
+#include "chrome/browser/signin/signin_ui_util.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 12 matching lines @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.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/layout.h"
 #include "ui/base/models/button_menu_item_model.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/text/text_elider.h"
-#include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/enumerate_modules_model_win.h"
 #include "chrome/browser/ui/metro_pin_tab_helper_win.h"
 #include "win8/util/win8_util.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #endif
 
 using content::HostZoomMap;
 using content::UserMetricsAction;
 using content::WebContents;
 
-namespace {
-// Maximum width of a username - we trim emails that are wider than this so
-// the wrench menu doesn't get ridiculously wide.
-const int kUsernameMaxWidth = 200;
-}  // namespace
-
 ////////////////////////////////////////////////////////////////////////////////
 // EncodingMenuModel
 
 EncodingMenuModel::EncodingMenuModel(Browser* browser)
     : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
       browser_(browser) {
   Build();
 }
 
 EncodingMenuModel::~EncodingMenuModel() {
@@ skipping 190 matching lines @@
     }
 #endif
     case IDC_VIEW_BACKGROUND_PAGES: {
       string16 num_background_pages = base::FormatNumber(
           TaskManager::GetBackgroundPageCount());
       return l10n_util::GetStringFUTF16(IDS_VIEW_BACKGROUND_PAGES,
                                         num_background_pages);
     }
     case IDC_UPGRADE_DIALOG:
       return l10n_util::GetStringUTF16(IDS_UPDATE_NOW);
-    case IDC_SHOW_SIGNIN: {
-      GlobalError* error = GetActiveSignedInServiceError();
-      if (error)
-        return error->MenuItemLabel();
-
-      // No errors, so just display the signed in user, if any.
-      Profile* profile = browser_->profile()->GetOriginalProfile();
-      ProfileSyncService* service = profile->IsSyncAccessible() ?
-          ProfileSyncServiceFactory::GetForProfile(profile) : NULL;
-
-      // Even if the user is signed in, don't display the "signed in as..."
-      // label if we're still setting up sync.
-      if (!service || service->HasSyncSetupCompleted()) {
-        SigninManager* signin_manager =
-            SigninManagerFactory::GetForProfile(profile);
-        std::string username = signin_manager->GetAuthenticatedUsername();
-        if (!username.empty() && !signin_manager->AuthInProgress()) {
-          string16 elided_username = ui::ElideEmail(UTF8ToUTF16(username),
-                                                    gfx::Font(),
-                                                    kUsernameMaxWidth);
-          return l10n_util::GetStringFUTF16(IDS_SYNC_MENU_SYNCED_LABEL,
-                                            elided_username);
-        }
-      }
-      return l10n_util::GetStringFUTF16(IDS_SYNC_MENU_PRE_SYNCED_LABEL,
-          l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
-    }
+    case IDC_SHOW_SIGNIN:
+      return signin_ui_util::GetSigninMenuLabel(
+          browser_->profile()->GetOriginalProfile());
     default:
       NOTREACHED();
       return string16();
   }
 }
 
 bool WrenchMenuModel::GetIconForCommandId(int command_id,
                                           gfx::Image* icon) const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   switch (command_id) {
     case IDC_UPGRADE_DIALOG: {
       if (UpgradeDetector::GetInstance()->notify_upgrade()) {
         *icon = rb.GetNativeImageNamed(
             UpgradeDetector::GetInstance()->GetIconResourceID(
                 UpgradeDetector::UPGRADE_ICON_TYPE_MENU_ICON));
         return true;
       }
       return false;
     }
     case IDC_SHOW_SIGNIN: {
-      GlobalError* error = GetActiveSignedInServiceError();
+      GlobalError* error = signin_ui_util::GetSignedInServiceError(
+          browser_->profile()->GetOriginalProfile());
       if (error) {
         int icon_id = error->MenuItemIconResourceID();
         if (icon_id) {
           *icon = rb.GetNativeImageNamed(icon_id);
           return true;
         }
       }
       return false;
     }
     default:
       break;
   }
   return false;
 }
 
 void WrenchMenuModel::ExecuteCommand(int command_id) {
   GlobalError* error = GlobalErrorServiceFactory::GetForProfile(
       browser_->profile())->GetGlobalErrorByMenuItemCommandID(command_id);
   if (error) {
     error->ExecuteMenuItem(browser_);
     return;
   }
 
   if (command_id == IDC_SHOW_SIGNIN) {
-    // If a custom error message is being shown, display it.
-    GlobalError* error = GetActiveSignedInServiceError();
+    // If a custom error message is being shown, handle it.
+    GlobalError* error = signin_ui_util::GetSignedInServiceError(
+        browser_->profile()->GetOriginalProfile());
     if (error) {
       error->ExecuteMenuItem(browser_);
       return;
     }
   }
 
   if (command_id == IDC_HELP_PAGE_VIA_MENU)
     content::RecordAction(UserMetricsAction("ShowHelpTabViaWrenchMenu"));
 
   chrome::ExecuteCommand(browser_, command_id);
@@ skipping 182 matching lines @@
 
   if (is_new_menu)
     CreateZoomMenu(is_new_menu);
   else
     AddSeparator(ui::NORMAL_SEPARATOR);
 
   AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY);
   AddItemWithStringId(IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS);
   AddSeparator(ui::NORMAL_SEPARATOR);
 
-  // TODO(atwilson): Remove call to IsSyncAccessible() once we fully support
-  // signin while sync is disabled.
-  if (browser_defaults::kShowSigninMenuItem &&
-      browser_->profile()->GetOriginalProfile()->IsSyncAccessible()) {
+  if (browser_defaults::kShowSigninMenuItem) {

[Roger Tawa OOO till Jul 10th, 2013/01/30 16:46:46]

maybe better to now replace with an #ifdef for chromeos?

[Andrew T Wilson (Slow), 2013/01/31 10:38:05]

Done.

     const string16 short_product_name =
         l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME);
     AddItem(IDC_SHOW_SYNC_SETUP, l10n_util::GetStringFUTF16(
         IDS_SYNC_MENU_PRE_SYNCED_LABEL, short_product_name));
     AddSeparator(ui::NORMAL_SEPARATOR);
   }
 
   AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS);
 
 #if defined(OS_CHROMEOS)
@@ skipping 141 matching lines @@
   bool enable_decrement = false;
   int zoom_percent = 100;
   if (browser_->tab_strip_model()->GetActiveWebContents()) {
     zoom_percent =
         browser_->tab_strip_model()->GetActiveWebContents()->GetZoomPercent(
             &enable_increment, &enable_decrement);
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
-
-GlobalError* WrenchMenuModel::GetActiveSignedInServiceError() const {
-  Profile* profile = browser_->profile()->GetOriginalProfile();
-  // Auth errors have the highest priority - after that, individual service
-  // errors.
-  SigninManager* signin_manager = SigninManagerFactory::GetForProfile(profile);
-  SigninGlobalError* signin_error = signin_manager->signin_global_error();
-  if (signin_error && signin_error->HasBadge())
-    return signin_error;
-
-  // No auth error - now try other services. Currently the list is just hard-
-  // coded but in the future if we add more we can create some kind of
-  // registration framework.
-  if (profile->IsSyncAccessible()) {
-    ProfileSyncService* service =
-        ProfileSyncServiceFactory::GetForProfile(profile);
-    SyncGlobalError* error = service->sync_global_error();
-    if (error && error->HasBadge())
-      return error;
-  }
-  return NULL;
-}