Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2737)

Unified Diff: chrome/browser/ui/sync/one_click_signin_helper.cc

Issue 14367029: Introduce SigninManagerDelegate and use to eliminate CookieSettings dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge LKGR Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/signin/signin_manager_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 fe4f5b2f86743d738ef75b827bc296def37a5eb1..90f9c30c24079a6db3b0596583a8c765da7d5fe3 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
@@ -31,7 +31,9 @@
#include "chrome/browser/profiles/profile_io_data.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/search/search.h"
+#include "chrome/browser/signin/chrome_signin_manager_delegate.h"
#include "chrome/browser/signin/signin_manager.h"
+#include "chrome/browser/signin/signin_manager_delegate.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/signin/signin_names_io_thread.h"
#include "chrome/browser/sync/profile_sync_service.h"
@@ -484,7 +486,7 @@ bool OneClickSigninHelper::CanOffer(content::WebContents* web_contents,
!profile->GetPrefs()->GetBoolean(prefs::kReverseAutologinEnabled))
return false;
- if (!SigninManager::AreSigninCookiesAllowed(profile))
+ if (!ChromeSigninManagerDelegate::ProfileAllowsSigninCookies(profile))
return false;
if (!email.empty()) {
@@ -608,7 +610,8 @@ OneClickSigninHelper::Offer OneClickSigninHelper::CanOfferOnIOThreadImpl(
if (!io_data->google_services_username()->GetValue().empty())
return DONT_OFFER;
- if (!SigninManager::AreSigninCookiesAllowed(io_data->GetCookieSettings()))
+ if (!ChromeSigninManagerDelegate::SettingsAllowSigninCookies(
+ io_data->GetCookieSettings()))
return DONT_OFFER;
// The checks below depend on chrome already knowing what account the user
« no previous file with comments | « chrome/browser/signin/signin_manager_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698