Remove PSS::ShowLoginDialog() and obsolete IDC_SYNC_BOOKMARKS.

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index c738146a453d5b7d423e30a30f1e3c4c711fcdae..ec4b8addbbdac2dd1e0dfde1bdeb4395a652af53 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -132,6 +132,8 @@
 #include "chrome/browser/ui/webui/feedback_ui.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"
 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
+#include "chrome/browser/ui/webui/signin/login_ui_service.h"
+#include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "chrome/browser/ui/window_sizer.h"
 #include "chrome/browser/upgrade_detector.h"
@@ -931,6 +933,13 @@ void Browser::OpenOptionsWindow(Profile* profile) {
 }
 
 // static
+void Browser::OpenSyncSetupWindow(Profile* profile) {

[sky, 2012/02/24 01:13:36]

Make position match header.

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

Done.

+  Browser* browser = Browser::Create(profile);
+  browser->ShowSyncSetup();
+  browser->window()->Show();
+}
+
+// static
 void Browser::OpenClearBrowsingDataDialogWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->OpenClearBrowsingDataDialog();
@@ -2374,11 +2383,6 @@ void Browser::OpenInstantConfirmDialog() {
   ShowOptionsTab(chrome::kInstantConfirmPage);
 }
 
-void Browser::OpenSyncMyBookmarksDialog() {
-  sync_ui_util::OpenSyncMyBookmarksDialog(
-      profile_, this, ProfileSyncService::START_FROM_WRENCH);
-}
-
 void Browser::OpenAboutChromeDialog() {
   content::RecordAction(UserMetricsAction("AboutChrome"));
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableUberPage)) {
@@ -3069,7 +3073,6 @@ void Browser::ExecuteCommandWithDisposition(
     case IDC_SHOW_HISTORY:          ShowHistoryTab();                 break;
     case IDC_SHOW_DOWNLOADS:        ShowDownloadsTab();               break;
     case IDC_MANAGE_EXTENSIONS:     ShowExtensionsTab();              break;
-    case IDC_SYNC_BOOKMARKS:        OpenSyncMyBookmarksDialog();      break;
     case IDC_OPTIONS:               OpenOptionsDialog();              break;
     case IDC_EDIT_SEARCH_ENGINES:   OpenSearchEngineOptionsDialog();  break;
     case IDC_VIEW_PASSWORDS:        OpenPasswordManager();            break;
@@ -4456,7 +4459,7 @@ void Browser::OnStateChanged() {
   if (!window_)
     return;
   const bool show_main_ui = IsShowingMainUI(window_->IsFullscreen());
-  command_updater_.UpdateCommandEnabled(IDC_SYNC_BOOKMARKS,
+  command_updater_.UpdateCommandEnabled(IDC_SHOW_SYNC_SETUP,
       show_main_ui && profile_->GetOriginalProfile()->IsSyncAccessible());
 }
 
@@ -4792,7 +4795,7 @@ void Browser::UpdateCommandsForFullscreenMode(bool is_fullscreen) {
   // Show various bits of UI
   command_updater_.UpdateCommandEnabled(IDC_DEVELOPER_MENU, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_FEEDBACK, show_main_ui);
-  command_updater_.UpdateCommandEnabled(IDC_SYNC_BOOKMARKS,
+  command_updater_.UpdateCommandEnabled(IDC_SHOW_SYNC_SETUP,
       show_main_ui && profile_->GetOriginalProfile()->IsSyncAccessible());
 
   // Settings page/subpages are forced to open in normal mode. We disable these
@@ -5576,7 +5579,8 @@ void Browser::ShowSyncSetup() {
     params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
     ShowSingletonTabOverwritingNTP(params);
   } else {
-    service->ShowLoginDialog();
+    LoginUIServiceFactory::GetForProfile(
+        profile()->GetOriginalProfile())->ShowLoginUI();
   }
 }