Remove PSS::ShowLoginDialog() and obsolete IDC_SYNC_BOOKMARKS.

chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.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/webui/ntp/new_tab_page_sync_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.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/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/webui/signin/login_ui_service.h"
+#include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "net/base/cookie_monster.h"
 #include "net/url_request/url_request_context.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // Default URL for the sync web interface.
 //
@@ skipping 79 matching lines @@
                                                  &link_text);
   SendSyncMessageToPage(FromSyncStatusMessageType(type),
                         UTF16ToUTF8(status_msg), UTF16ToUTF8(link_text));
 }
 
 void NewTabPageSyncHandler::HandleSyncLinkClicked(const ListValue* args) {
   DCHECK(!waiting_for_initial_page_load_);
   DCHECK(sync_service_);
   if (!sync_service_->IsSyncEnabled())
     return;
+  Browser* browser =
+      BrowserList::FindBrowserWithWebContents(web_ui()->GetWebContents());
+  if (!browser || browser->IsAttemptingToCloseBrowser())
+    return;
+  browser->ShowSyncSetup();
+
   if (sync_service_->HasSyncSetupCompleted()) {
-    sync_service_->ShowErrorUI();
-    string16 user = UTF8ToUTF16(sync_service_->profile()->GetPrefs()->GetString(
-        prefs::kGoogleServicesUsername));
+    string16 user = UTF8ToUTF16(SigninManagerFactory::GetForProfile(
+        Profile::FromWebUI(web_ui()))->GetAuthenticatedUsername());
     DictionaryValue value;
     value.SetString("syncEnabledMessage",
                     l10n_util::GetStringFUTF16(IDS_SYNC_NTP_SYNCED_TO,
                     user));
     web_ui()->CallJavascriptFunction("syncAlreadyEnabled", value);
   } else {
-    // User clicked the 'Start now' link to begin syncing.
     ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_NTP);
-    sync_service_->ShowLoginDialog();
   }
 }
 
 void NewTabPageSyncHandler::OnStateChanged() {
   // Don't do anything if the page has not yet loaded.
   if (waiting_for_initial_page_load_)
     return;
   BuildAndSendSyncStatus();
 }
 
@@ skipping 32 matching lines @@
       if (linkurl.empty()) {
         value.SetBoolean("linkurlisset", false);
       } else {
         value.SetBoolean("linkurlisset", true);
         value.SetString("linkurl", linkurl);
       }
     }
   }
   web_ui()->CallJavascriptFunction("syncMessageChanged", value);
 }