Remove PSS::ShowLoginDialog() and obsolete IDC_SYNC_BOOKMARKS.

chrome/browser/app_controller_mac.mm

 // 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.
 
 #import "chrome/browser/app_controller_mac.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 749 matching lines @@
         case IDC_SHOW_BOOKMARK_MANAGER:
           enable = [self keyWindowIsNotModal];
           break;
         // Browser-level items that open in new windows.
         case IDC_NEW_WINDOW:
         case IDC_TASK_MANAGER:
           // Allow the user to open a new window if there's a window-modal
           // dialog.
           enable = [self keyWindowIsNotModal] || ([NSApp modalWindow] == nil);
           break;
-        case IDC_SYNC_BOOKMARKS: {
+        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";
@@ skipping 118 matching lines @@
         browser->ShowExtensionsTab();
       else
         Browser::OpenExtensionsWindow(lastProfile);
       break;
     case IDC_HELP_PAGE:
       if (Browser* browser = ActivateBrowser(lastProfile))
         browser->ShowHelpTab();
       else
         Browser::OpenHelpWindow(lastProfile);
       break;
-    case IDC_SYNC_BOOKMARKS:
-      // 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;
-      }
-      // TODO(akalin): Add a constant to denote starting sync from the
-      // main menu and use that instead of START_FROM_WRENCH.
-      sync_ui_util::OpenSyncMyBookmarksDialog(
-          lastProfile, ActivateBrowser(lastProfile),
-          ProfileSyncService::START_FROM_WRENCH);
+    case IDC_SHOW_SYNC_SETUP:
+      if (Browser* browser = ActivateBrowser(lastProfile))

[akalin, 2012/02/24 01:56:13]

almost certain this is against style. what about:

case IDC...: {
  Browser* browser = ...;
  if (browser) {
     ..
  } else {
     ..
  }
}

[Andrew T Wilson (Slow), 2012/02/24 22:12:11]

not changing per our discussion.

+        browser->ShowSyncSetup();
+      else
+        Browser::OpenSyncSetupWindow(lastProfile);
       break;
     case IDC_TASK_MANAGER:
       content::RecordAction(UserMetricsAction("TaskManager"));
       TaskManagerMac::Show(false);
       break;
     case IDC_OPTIONS:
       [self showPreferences:sender];
       break;
     default:
       // Background Applications use dynamic values that must be less than the
@@ skipping 104 matching lines @@
   menuState_->UpdateCommandEnabled(IDC_RESTORE_TAB, false);
   menuState_->UpdateCommandEnabled(IDC_FOCUS_LOCATION, true);
   menuState_->UpdateCommandEnabled(IDC_FOCUS_SEARCH, true);
   menuState_->UpdateCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER, true);
   menuState_->UpdateCommandEnabled(IDC_SHOW_HISTORY, true);
   menuState_->UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true);
   menuState_->UpdateCommandEnabled(IDC_MANAGE_EXTENSIONS, true);
   menuState_->UpdateCommandEnabled(IDC_HELP_PAGE, true);
   menuState_->UpdateCommandEnabled(IDC_IMPORT_SETTINGS, true);
   menuState_->UpdateCommandEnabled(IDC_FEEDBACK, true);
-  menuState_->UpdateCommandEnabled(IDC_SYNC_BOOKMARKS, true);
+  menuState_->UpdateCommandEnabled(IDC_SHOW_SYNC_SETUP, true);
   menuState_->UpdateCommandEnabled(IDC_TASK_MANAGER, true);
 }
 
 // Conditionally adds the Profile menu to the main menu bar.
 - (void)initProfileMenu {
   NSMenu* mainMenu = [NSApp mainMenu];
   NSMenuItem* profileMenu = [mainMenu itemWithTag:IDC_PROFILE_MAIN_MENU];
 
   // On Leopard, hiding main menubar items does not work. This manifests itself
   // in Chromium as squished menu items <http://crbug.com/90753>. To prevent
@@ skipping 288 matching lines @@
 
 }  // namespace browser
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac