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

Unified Diff: chrome/browser/ui/webui/options/manage_profile_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/manage_profile_handler.cc
diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc
index be8aa22a953819bc6ad969efa3a266275ae0a3fe..a11a7cb627a0101ef34857cf6cec2dd09e4b6875 100644
--- a/chrome/browser/ui/webui/options/manage_profile_handler.cc
+++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc
@@ -76,7 +76,7 @@ ManageProfileHandler::ManageProfileHandler()
}
ManageProfileHandler::~ManageProfileHandler() {
- ProfileSyncService* service =
+ browser_sync::ProfileSyncService* service =
ProfileSyncServiceFactory::GetForProfile(Profile::FromWebUI(web_ui()));
// Sync may be disabled in tests.
if (service)
@@ -151,7 +151,7 @@ void ManageProfileHandler::InitializeHandler() {
prefs::kSupervisedUserCreationAllowed,
base::Bind(&ManageProfileHandler::OnCreateSupervisedUserPrefChange,
base::Unretained(this)));
- ProfileSyncService* service =
+ browser_sync::ProfileSyncService* service =
ProfileSyncServiceFactory::GetForProfile(profile);
// Sync may be disabled for tests.
if (service)
@@ -474,8 +474,8 @@ void ManageProfileHandler::RequestCreateProfileUpdate(
SigninManagerFactory::GetForProfile(profile);
base::string16 username =
base::UTF8ToUTF16(manager->GetAuthenticatedAccountInfo().email);
- ProfileSyncService* service =
- ProfileSyncServiceFactory::GetForProfile(profile);
+ browser_sync::ProfileSyncService* service =
+ ProfileSyncServiceFactory::GetForProfile(profile);
GoogleServiceAuthError::State state = GoogleServiceAuthError::NONE;
// |service| might be null if Sync is disabled from the command line.
« no previous file with comments | « chrome/browser/ui/webui/options/create_profile_handler.cc ('k') | chrome/browser/ui/webui/options/password_manager_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698