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

Unified Diff: chrome/browser/sync/sync_ui_util.cc

Issue 2461463002: [Sync] Replacing NULL with nullptr/null throughout sync code. (Closed)
Patch Set: Reverted PROFILE_nullptr mistake. Created 4 years, 2 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/sync/sync_ui_util.h ('k') | chrome/browser/sync/sync_ui_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_ui_util.cc
diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc
index 8259e6e5ad46c6528fb5ec4b6b258c3f1bced3c3..925d2c875164595563b541bc2b0070dbfbe4900a 100644
--- a/chrome/browser/sync/sync_ui_util.cc
+++ b/chrome/browser/sync/sync_ui_util.cc
@@ -93,7 +93,7 @@ base::string16 GetSyncedStateStatusLabel(ProfileSyncService* service,
base::ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
default:
NOTREACHED();
- return NULL;
+ return nullptr;
}
}
@@ -126,14 +126,14 @@ void GetStatusForActionableError(
// TODO(akalin): Write unit tests for these three functions below.
-// status_label and link_label must either be both NULL or both non-NULL.
+// status_label and link_label must either be both null or both non-null.
MessageType GetStatusInfo(Profile* profile,
ProfileSyncService* service,
const SigninManagerBase& signin,
StatusLabelStyle style,
base::string16* status_label,
base::string16* link_label) {
- DCHECK_EQ(status_label == NULL, link_label == NULL);
+ DCHECK_EQ(status_label == nullptr, link_label == nullptr);
MessageType result_type(SYNCED);
« no previous file with comments | « chrome/browser/sync/sync_ui_util.h ('k') | chrome/browser/sync/sync_ui_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698