Remove PSS::ShowLoginDialog() and obsolete IDC_SYNC_BOOKMARKS.

chrome/browser/extensions/app_notify_channel_setup.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/extensions/app_notify_channel_setup.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/metrics/histogram.h"
 #include "base/stringprintf.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/signin/token_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/net/gaia/gaia_urls.h"
 #include "chrome/common/net/http_return.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/url_fetcher.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
@@ skipping 112 matching lines @@
   fetcher->SetLoadFlags(
       net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES);
   fetcher->SetExtraRequestHeaders(MakeAuthorizationHeader(auth_token));
   if (!body.empty()) {
     fetcher->SetUploadData("application/x-www-form-urlencoded", body);
   }
   return fetcher;
 }
 
 bool AppNotifyChannelSetup::ShouldPromptForLogin() const {
-  std::string username = profile_->GetPrefs()->GetString(
-      prefs::kGoogleServicesUsername);
+  std::string username =
+      SigninManagerFactory::GetForProfile(profile_)->GetAuthenticatedUsername();
   // Prompt for login if either:
   // 1. the user has not logged in at all or
   // 2. if the user is logged in but there is no OAuth2 login token.
   //    The latter happens for users who are already logged in before the
   //    code to generate OAuth2 login token is released.
   // 3. If the OAuth2 login token does not work anymore.
   //    This can happen if the user explicitly revoked access to Google Chrome
   //    from Google Accounts page.
   return username.empty() ||
          !profile_->GetTokenService()->HasOAuthLoginToken() ||
@@ skipping 235 matching lines @@
   DictionaryValue* dict = static_cast<DictionaryValue*>(value.get());
   if (!dict->Get("id", &channel_id_value))
     return false;
   if (channel_id_value->GetType() != base::Value::TYPE_STRING)
     return false;
 
   StringValue* channel_id = static_cast<StringValue*>(channel_id_value);
   channel_id->GetAsString(result);
   return true;
 }