Index: chrome/browser/ui/sync/one_click_signin_helper.cc |
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc |
index ad7c36d8dbffa4ff2551908de5f8ac6830e081dc..899a0313a66f1d2c612ead4bfa82f4e82c7458ba 100644 |
--- a/chrome/browser/ui/sync/one_click_signin_helper.cc |
+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc |
@@ -36,6 +36,7 @@ |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/search/search.h" |
#include "chrome/browser/signin/chrome_signin_client.h" |
+#include "chrome/browser/signin/chrome_signin_client_factory.h" |
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
#include "chrome/browser/signin/signin_manager.h" |
#include "chrome/browser/signin/signin_manager_factory.h" |
@@ -1112,10 +1113,10 @@ void OneClickSigninHelper::ShowInfoBarUIThread( |
// show a modal dialog asking the user to confirm. |
Profile* profile = |
Profile::FromBrowserContext(web_contents->GetBrowserContext()); |
- SigninManager* manager = profile ? |
- SigninManagerFactory::GetForProfile(profile) : NULL; |
+ ChromeSigninClient* signin_client = |
+ profile ? ChromeSigninClientFactory::GetForProfile(profile) : NULL; |
helper->untrusted_confirmation_required_ |= |
- (manager && !manager->IsSigninProcess(child_id)); |
+ (signin_client && !signin_client->IsSigninProcess(child_id)); |
if (continue_url.is_valid()) { |
// Set |original_continue_url_| if it is currently empty. |continue_url| |
@@ -1307,11 +1308,11 @@ void OneClickSigninHelper::DidNavigateMainFrame( |
// sign-in process when a navigation to a non-sign-in URL occurs. |
Profile* profile = |
Profile::FromBrowserContext(web_contents()->GetBrowserContext()); |
- SigninManager* manager = profile ? |
- SigninManagerFactory::GetForProfile(profile) : NULL; |
+ ChromeSigninClient* signin_client = |
+ profile ? ChromeSigninClientFactory::GetForProfile(profile) : NULL; |
int process_id = web_contents()->GetRenderProcessHost()->GetID(); |
- if (manager && manager->IsSigninProcess(process_id)) |
- manager->ClearSigninProcess(); |
+ if (signin_client && signin_client->IsSigninProcess(process_id)) |
+ signin_client->ClearSigninProcess(); |
// If the navigation to a non-sign-in URL hasn't been triggered by the web |
// contents, the sign in flow has been aborted and the state must be |