Remove PSS::ShowLoginDialog() and obsolete IDC_SYNC_BOOKMARKS.

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 114 matching lines @@
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tabs/dock_info.h"
 #include "chrome/browser/ui/tabs/tab_menu_model.h"
 #include "chrome/browser/ui/web_applications/web_app_ui.h"
 #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"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
@@ skipping 779 matching lines @@
 }
 
 // static
 void Browser::OpenOptionsWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->OpenOptionsDialog();
   browser->window()->Show();
 }
 
 // static
+void Browser::OpenSyncSetupWindow(Profile* profile) {
+  Browser* browser = Browser::Create(profile);
+  browser->ShowSyncSetup();
+  browser->window()->Show();
+}
+
+// static
 void Browser::OpenClearBrowsingDataDialogWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->OpenClearBrowsingDataDialog();
   browser->window()->Show();
 }
 
 // static
 void Browser::OpenImportSettingsDialogWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->OpenImportSettingsDialog();
@@ skipping 1423 matching lines @@
 
 void Browser::OpenImportSettingsDialog() {
   content::RecordAction(UserMetricsAction("Import_ShowDlg"));
   ShowOptionsTab(chrome::kImportDataSubPage);
 }
 
 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)) {
 #if defined(OS_CHROMEOS)
     std::string chrome_settings(chrome::kChromeUISettingsURL);
     ShowSingletonTab(
         GURL(chrome_settings.append(chrome::kAboutOptionsSubPage)));
 #else
     window_->ShowAboutChromeDialog();
 #endif
@@ skipping 670 matching lines @@
 
     case IDC_SHOW_BOOKMARK_BAR:     ToggleBookmarkBar();              break;
     case IDC_PROFILING_ENABLED:     Profiling::Toggle();              break;
 
     case IDC_SHOW_BOOKMARK_MANAGER: OpenBookmarkManager();            break;
     case IDC_SHOW_APP_MENU:         ShowAppMenu();                    break;
     case IDC_SHOW_AVATAR_MENU:      ShowAvatarMenu();                 break;
     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;
     case IDC_CLEAR_BROWSING_DATA:   OpenClearBrowsingDataDialog();    break;
     case IDC_IMPORT_SETTINGS:       OpenImportSettingsDialog();       break;
     case IDC_ABOUT:                 OpenAboutChromeDialog();          break;
     case IDC_UPGRADE_DIALOG:        OpenUpdateChromeDialog();         break;
     case IDC_VIEW_INCOMPATIBILITIES: ShowAboutConflictsTab();         break;
     case IDC_HELP_PAGE:             ShowHelpTab();                    break;
 #if defined(OS_CHROMEOS)
@@ skipping 1366 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, ProfileSyncServiceObserver implementation:
 
 void Browser::OnStateChanged() {
   DCHECK(ProfileSyncServiceFactory::GetInstance()->HasProfileSyncService(
       profile_));
   // For unit tests, we don't have a window.
   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());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, InstantDelegate implementation:
 
 void Browser::ShowInstant(TabContentsWrapper* preview_contents) {
   DCHECK(instant_->tab_contents() == GetSelectedTabContentsWrapper());
   window_->ShowInstant(preview_contents);
 
@@ skipping 315 matching lines @@
   command_updater_.UpdateCommandEnabled(
       IDC_FOCUS_PREVIOUS_PANE, main_not_fullscreen);
   command_updater_.UpdateCommandEnabled(
       IDC_FOCUS_BOOKMARKS, main_not_fullscreen);
   command_updater_.UpdateCommandEnabled(
       IDC_FOCUS_CHROMEOS_STATUS, main_not_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
   // commands when incognito is forced.
   const bool options_enabled = show_main_ui &&
       IncognitoModePrefs::GetAvailability(
           profile_->GetPrefs()) != IncognitoModePrefs::FORCED;
   command_updater_.UpdateCommandEnabled(IDC_OPTIONS, options_enabled);
   command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, options_enabled);
 
@@ skipping 755 matching lines @@
       (reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE) ?
       BookmarkBar::ANIMATE_STATE_CHANGE :
       BookmarkBar::DONT_ANIMATE_STATE_CHANGE;
   window_->BookmarkBarStateChanged(animate_type);
 }
 
 void Browser::ShowSyncSetup() {
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(
           profile()->GetOriginalProfile());
+  LoginUIService* login_service =
+      LoginUIServiceFactory::GetForProfile(profile()->GetOriginalProfile());
   if (service->HasSyncSetupCompleted()) {
     ShowOptionsTab(chrome::kPersonalOptionsSubPage);
-  } else if (SyncPromoUI::ShouldShowSyncPromo(profile())) {
+  } else if (SyncPromoUI::ShouldShowSyncPromo(profile()) &&
+             login_service->current_login_ui() == NULL) {
+    // There is no currently active login UI, so display a new promo page.
     GURL url(SyncPromoUI::GetSyncPromoURL(GURL(), false, std::string()));
     browser::NavigateParams params(GetSingletonTabNavigateParams(GURL(url)));
     params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
     ShowSingletonTabOverwritingNTP(params);
   } else {
-    service->ShowLoginDialog();
+    LoginUIServiceFactory::GetForProfile(
+        profile()->GetOriginalProfile())->ShowLoginUI();
   }
 }
 
 void Browser::ToggleSpeechInput() {
   GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
 }