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

Unified Diff: athena/system/system_ui_impl.cc

Issue 653563004: NULL -> nullptr under athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 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 | « athena/system/network_selector.cc ('k') | athena/test/base/activity_lifetime_tracker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/system/system_ui_impl.cc
diff --git a/athena/system/system_ui_impl.cc b/athena/system/system_ui_impl.cc
index 64653bad988b1f1ab025b464a95d490bc66319c0..5bbd3ee9ba566613b2df7902a60cc1d54927db01 100644
--- a/athena/system/system_ui_impl.cc
+++ b/athena/system/system_ui_impl.cc
@@ -21,7 +21,7 @@
namespace athena {
namespace {
-SystemUI* instance = NULL;
+SystemUI* instance = nullptr;
// View which positions the TimeView on the left and the StatusIconView on the
// right.
@@ -74,7 +74,7 @@ class SystemUIImpl : public SystemUI {
public:
SystemUIImpl(scoped_refptr<base::TaskRunner> blocking_task_runner)
: orientation_controller_(new OrientationController()),
- background_container_(NULL) {
+ background_container_(nullptr) {
orientation_controller_->InitWith(blocking_task_runner);
}
@@ -144,7 +144,7 @@ SystemUI* SystemUI::Get() {
void SystemUI::Shutdown() {
CHECK(instance);
delete instance;
- instance = NULL;
+ instance = nullptr;
}
} // namespace athena
« no previous file with comments | « athena/system/network_selector.cc ('k') | athena/test/base/activity_lifetime_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698