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

Unified Diff: chrome/browser/signin/signin_ui_util.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/signin/signin_ui_util.cc
diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/signin_ui_util.cc
index 8b6645be2616bab0fa191c2c64acb2466dc8f2d0..824fbb0610a4755c411a7936a185a6ccbca4e703 100644
--- a/chrome/browser/signin/signin_ui_util.cc
+++ b/chrome/browser/signin/signin_ui_util.cc
@@ -66,11 +66,11 @@ std::vector<GlobalError*> GetSignedInServiceErrors(Profile* profile) {
}
// If a signed in service is reporting an error, returns the GlobalError
-// object associated with that service, or NULL if no errors are reported.
+// object associated with that service, or null if no errors are reported.
GlobalError* GetSignedInServiceError(Profile* profile) {
std::vector<GlobalError*> errors = GetSignedInServiceErrors(profile);
if (errors.empty())
- return NULL;
+ return nullptr;
return errors[0];
}
@@ -82,8 +82,10 @@ base::string16 GetSigninMenuLabel(Profile* profile) {
return error->MenuItemLabel();
// No errors, so just display the signed in user, if any.
- ProfileSyncService* service = profile->IsSyncAllowed() ?
- ProfileSyncServiceFactory::GetForProfile(profile) : NULL;
+ browser_sync::ProfileSyncService* service =
+ profile->IsSyncAllowed()
+ ? ProfileSyncServiceFactory::GetForProfile(profile)
+ : nullptr;
// Even if the user is signed in, don't display the "signed in as..."
// label if we're still setting up sync.

Powered by Google App Engine
This is Rietveld 408576698