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

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #import "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_*
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/managed_mode/managed_mode.h"
 #include "chrome/browser/profiles/avatar_menu_model.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/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/sync/sync_ui_util.h"
+#include "chrome/browser/signin/signin_ui_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #import "chrome/browser/ui/cocoa/background_gradient_view.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
@@ skipping 199 matching lines @@
     NSInteger signinItemIndex = [menu indexOfItem:signinMenuItem];
     DCHECK_NE(signinItemIndex, -1);
     if ((signinItemIndex + 1) < [menu numberOfItems]) {
       NSMenuItem* menuItem = [menu itemAtIndex:(signinItemIndex + 1)];
       if ([menuItem isSeparatorItem]) {
         followingSeparator = menuItem;
       }
     }
   }
 
-  // Figure out what string to display in the signin menu item - depending on
-  // the state of the signed-in services, this will be one of:
-  //   "Sign in to <product name>"
-  //   "Signed in as <username>"
-  //   "Signin Error"
-  ProfileSyncService* syncService = profile->IsSyncAccessible() ?
-      ProfileSyncServiceFactory::GetInstance()->GetForProfile(
-          profile->GetOriginalProfile()) : NULL;
-  SigninManager* signin = SigninManagerFactory::GetForProfile(profile);
-  std::string userName = signin->GetAuthenticatedUsername();
-  NSString* title = NULL;
-  if (userName.empty() || signin->AuthInProgress() ||
-      (syncService && !syncService->HasSyncSetupCompleted())) {
-    // Not signed in yet - display the default string.
-    title = GetNSStringFWithFixup(IDS_SYNC_MENU_PRE_SYNCED_LABEL,
-                                  GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
-  } else if (signin->signin_global_error()->HasBadge()) {
-    // TODO(atwilson): Change this string to a generic signin error instead of
-    // a "Sync error" string once we allow signin without sync.
-    title = GetNSStringWithFixup(IDS_SYNC_MENU_SYNC_ERROR_LABEL);
-  } else if (syncService && syncService->sync_global_error() &&
-             syncService->sync_global_error()->HasBadge()) {
-    title = GetNSStringWithFixup(IDS_SYNC_MENU_SYNC_ERROR_LABEL);
-  } else {
-    // Signed in.
-    title = GetNSStringFWithFixup(IDS_SYNC_MENU_SYNCED_LABEL,
-                                  UTF8ToUTF16(userName));
-  }
-
-  [signinMenuItem setTitle:title];
+  string16 label = signin_ui_util::GetSigninMenuLabel(profile);
+  [signinMenuItem setTitle:l10n_util::FixUpWindowsStyleLabel(label)];
   [signinMenuItem setHidden:!showSigninMenuItem];
   [followingSeparator setHidden:!showSigninMenuItem];
 }
 
 // Load the browser window nib and do any Cocoa-specific initialization.
 // Takes ownership of |browser|. Note that the nib also sets this controller
 // up as the window's delegate.
 - (id)initWithBrowser:(Browser*)browser {
   return [self initWithBrowser:browser takeOwnership:YES];
 }
@@ skipping 826 matching lines @@
             NSString* menuTitle = l10n_util::GetNSString(
                 [self inPresentationMode] ? IDS_EXIT_PRESENTATION_MAC :
                                             IDS_ENTER_PRESENTATION_MAC);
             [static_cast<NSMenuItem*>(item) setTitle:menuTitle];
           }
           break;
         }
         case IDC_SHOW_SIGNIN: {
           Profile* original_profile =
               browser_->profile()->GetOriginalProfile();
-          enable &= original_profile->IsSyncAccessible();
           [BrowserWindowController updateSigninItem:item
                                          shouldShow:enable
                                      currentProfile:original_profile];
           break;
         }
         default:
           // Special handling for the contents of the Text Encoding submenu. On
           // Mac OS, instead of enabling/disabling the top-level menu item, we
           // enable/disable the submenu's contents (per Apple's HIG).
           EncodingMenuController encoding_controller;
@@ skipping 1103 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)