| 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
|
|
|