NULL -> nullptr under athena/

athena/env/athena_env_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/env/public/athena_env.h"
 
 #include <vector>
 
 #include "athena/util/fill_layout_manager.h"
 #include "base/sys_info.h"
@@ skipping 16 matching lines @@
 #include "ui/wm/core/cursor_manager.h"
 #include "ui/wm/core/input_method_event_filter.h"
 #include "ui/wm/core/native_cursor_manager.h"
 #include "ui/wm/core/native_cursor_manager_delegate.h"
 #include "ui/wm/core/user_activity_detector.h"
 
 namespace athena {
 
 namespace {
 
-AthenaEnv* instance = NULL;
+AthenaEnv* instance = nullptr;
 
 // Screen object used during shutdown.
-gfx::Screen* screen_for_shutdown = NULL;
+gfx::Screen* screen_for_shutdown = nullptr;
 
 // TODO(flackr:oshima): Remove this once athena switches to share
 // ash::DisplayManager.
 class ScreenForShutdown : public gfx::Screen {
  public:
   // Creates and sets the screen for shutdown. Deletes existing one if any.
   static void Create(const gfx::Screen* screen) {
     delete screen_for_shutdown;
     screen_for_shutdown = new ScreenForShutdown(screen->GetPrimaryDisplay());
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,
                                    screen_for_shutdown);
   }
 
  private:
   explicit ScreenForShutdown(const gfx::Display& primary_display)
       : primary_display_(primary_display) {}
 
   // gfx::Screen overrides:
   virtual gfx::Point GetCursorScreenPoint() override { return gfx::Point(); }
-  virtual gfx::NativeWindow GetWindowUnderCursor() override { return NULL; }
+  virtual gfx::NativeWindow GetWindowUnderCursor() override { return nullptr; }
   virtual gfx::NativeWindow GetWindowAtScreenPoint(
       const gfx::Point& point) override {
-    return NULL;
+    return nullptr;
   }
   virtual int GetNumDisplays() const override { return 1; }
   virtual std::vector<gfx::Display> GetAllDisplays() const override {
     std::vector<gfx::Display> displays(1, primary_display_);
     return displays;
   }
   virtual gfx::Display GetDisplayNearestWindow(
       gfx::NativeView view) const override {
     return primary_display_;
   }
@@ skipping 138 matching lines @@
         user_activity_detector_.get()));
 
     host_->AddObserver(this);
     host_->Show();
 
     DCHECK(!instance);
     instance = this;
   }
 
   virtual ~AthenaEnvImpl() {
-    instance = NULL;
+    instance = nullptr;
 
     host_->RemoveObserver(this);
     if (input_method_filter_)
       root_window_event_filter_->RemoveHandler(input_method_filter_.get());
     if (user_activity_detector_) {
       host_->event_processor()->GetRootTarget()->RemovePreTargetHandler(
           user_activity_detector_.get());
     }
     root_window_event_filter_.reset();
     capture_client_.reset();
@@ skipping 112 matching lines @@
 
 // static
 
 // static
 void AthenaEnv::Shutdown() {
   DCHECK(instance);
   delete instance;
 }
 
 }  // namespace athena