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

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

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Address comments. Created 4 years, 3 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
Index: chrome/browser/ui/sync/one_click_signin_sync_observer.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_observer.cc b/chrome/browser/ui/sync/one_click_signin_sync_observer.cc
index 74725d5b84dd08acc44c1a80fed69bb1c5c7c528..1606d388213a5f3b0859ffcbd49ef4fd6a68828d 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_observer.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_observer.cc
@@ -34,7 +34,7 @@ OneClickSigninSyncObserver::OneClickSigninSyncObserver(
weak_ptr_factory_(this) {
DCHECK(!continue_url_.is_empty());
- ProfileSyncService* sync_service = GetSyncService(web_contents);
+ browser_sync::ProfileSyncService* sync_service = GetSyncService(web_contents);
if (sync_service) {
sync_service->AddObserver(this);
} else {
@@ -53,7 +53,8 @@ OneClickSigninSyncObserver::OneClickSigninSyncObserver(
OneClickSigninSyncObserver::~OneClickSigninSyncObserver() {}
void OneClickSigninSyncObserver::WebContentsDestroyed() {
- ProfileSyncService* sync_service = GetSyncService(web_contents());
+ browser_sync::ProfileSyncService* sync_service =
+ GetSyncService(web_contents());
if (sync_service)
sync_service->RemoveObserver(this);
@@ -61,7 +62,8 @@ void OneClickSigninSyncObserver::WebContentsDestroyed() {
}
void OneClickSigninSyncObserver::OnStateChanged() {
- ProfileSyncService* sync_service = GetSyncService(web_contents());
+ browser_sync::ProfileSyncService* sync_service =
+ GetSyncService(web_contents());
// At this point, the sign-in process is complete, and control has been handed
// back to the sync engine. Close the gaia sign in tab if the |continue_url_|
@@ -99,7 +101,7 @@ void OneClickSigninSyncObserver::LoadContinueUrl() {
std::string());
}
-ProfileSyncService* OneClickSigninSyncObserver::GetSyncService(
+browser_sync::ProfileSyncService* OneClickSigninSyncObserver::GetSyncService(
content::WebContents* web_contents) {
Profile* profile =
Profile::FromBrowserContext(web_contents->GetBrowserContext());

Powered by Google App Engine
This is Rietveld 408576698