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

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.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/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index fb813a4cc7643510b166bcea26b557bf274531db..25bb67a21d44d073a39f89d16ab588af56693830 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -205,8 +205,9 @@ BrowserOptionsHandler::BrowserOptionsHandler()
}
BrowserOptionsHandler::~BrowserOptionsHandler() {
- ProfileSyncService* sync_service(ProfileSyncServiceFactory::
- GetInstance()->GetForProfile(Profile::FromWebUI(web_ui())));
+ browser_sync::ProfileSyncService* sync_service(
+ ProfileSyncServiceFactory::GetInstance()->GetForProfile(
+ Profile::FromWebUI(web_ui())));
if (sync_service)
sync_service->RemoveObserver(this);
@@ -953,7 +954,7 @@ void BrowserOptionsHandler::InitializeHandler() {
g_browser_process->profile_manager()->
GetProfileAttributesStorage().AddObserver(this);
- ProfileSyncService* sync_service(
+ browser_sync::ProfileSyncService* sync_service(
ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile));
// TODO(blundell): Use a ScopedObserver to observe the PSS so that cleanup on
// destruction is automatic.
@@ -1538,7 +1539,7 @@ BrowserOptionsHandler::GetSyncStateDictionary() {
SigninManagerFactory::GetForProfile(profile)->IsSignoutProhibited();
#endif
- ProfileSyncService* service =
+ browser_sync::ProfileSyncService* service =
ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile);
SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);
DCHECK(signin);
« no previous file with comments | « chrome/browser/ui/webui/ntp/ntp_user_data_logger.cc ('k') | chrome/browser/ui/webui/options/clear_browser_data_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698