Reland c91b178b07b0d - Delete dead signin code (SigninGlobalError)

chrome/browser/app_controller_mac.mm

Index: chrome/browser/app_controller_mac.mm
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 137a0605b44a98a3251cb5844cc57e5e4fcc572e..e1f5a42245b7e9a0dace2f011e63a06e94f4ac8f 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -44,7 +44,6 @@
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_promo.h"
-#include "chrome/browser/signin/signin_ui_util.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/ui/browser.h"
@@ -303,33 +302,6 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
 
 @synthesize startupComplete = startupComplete_;
 
-+ (void)updateSigninItem:(id)signinItem
-              shouldShow:(BOOL)showSigninMenuItem
-          currentProfile:(Profile*)profile {
-  DCHECK([signinItem isKindOfClass:[NSMenuItem class]]);
-  NSMenuItem* signinMenuItem = static_cast<NSMenuItem*>(signinItem);
-
-  // Look for a separator immediately after the menu item so it can be hidden
-  // or shown appropriately along with the signin menu item.
-  NSMenuItem* followingSeparator = nil;
-  NSMenu* menu = [signinItem menu];
-  if (menu) {
-    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;
-      }
-    }
-  }
-
-  base::string16 label = signin_ui_util::GetSigninMenuLabel(profile);
-  [signinMenuItem setTitle:l10n_util::FixUpWindowsStyleLabel(label)];
-  [signinMenuItem setHidden:!showSigninMenuItem];
-  [followingSeparator setHidden:!showSigninMenuItem];
-}
-
 - (void)dealloc {
   [[closeTabMenuItem_ menu] setDelegate:nil];
   [super dealloc];
@@ -957,27 +929,6 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
           // dialog.
           enable = ![self keyWindowIsModal];
           break;
-        case IDC_SHOW_SYNC_SETUP: {
-          Profile* lastProfile = [self lastProfile];
-          // The profile may be NULL during shutdown -- see
-          // http://code.google.com/p/chromium/issues/detail?id=43048 .
-          //
-          // TODO(akalin,viettrungluu): Figure out whether this method
-          // can be prevented from being called if lastProfile is
-          // NULL.
-          if (!lastProfile) {
-            LOG(WARNING)
-                << "NULL lastProfile detected -- not doing anything";
-            break;
-          }
-          SigninManager* signin = SigninManagerFactory::GetForProfile(
-              lastProfile->GetOriginalProfile());
-          enable = signin->IsSigninAllowed() && ![self keyWindowIsModal];
-          [AppController updateSigninItem:item
-                               shouldShow:enable
-                           currentProfile:lastProfile];
-          break;
-        }
 #if defined(GOOGLE_CHROME_BUILD)
         case IDC_FEEDBACK:
           enable = NO;
@@ -1129,14 +1080,6 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
       else
         chrome::OpenHelpWindow(lastProfile, chrome::HELP_SOURCE_MENU);
       break;
-    case IDC_SHOW_SYNC_SETUP:
-      if (Browser* browser = ActivateBrowser(lastProfile)) {
-        chrome::ShowBrowserSigninOrSettings(browser,
-                                            signin_metrics::SOURCE_MENU);
-      } else {
-        chrome::OpenSyncSetupWindow(lastProfile, signin_metrics::SOURCE_MENU);
-      }
-      break;
     case IDC_TASK_MANAGER:
       chrome::OpenTaskManager(NULL);
       break;
@@ -1290,7 +1233,6 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
 #if defined(GOOGLE_CHROME_BUILD)
   menuState_->UpdateCommandEnabled(IDC_FEEDBACK, true);
 #endif
-  menuState_->UpdateCommandEnabled(IDC_SHOW_SYNC_SETUP, true);
   menuState_->UpdateCommandEnabled(IDC_TASK_MANAGER, true);
 }