NULL -> nullptr under athena/

athena/main/athena_launcher.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/main/public/athena_launcher.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/public/app_registry.h"
 #include "athena/content/public/content_activity_factory_creator.h"
@@ skipping 45 matching lines @@
 class VirtualKeyboardObserver;
 
 // Athena's env state.
 struct AthenaEnvState {
   scoped_ptr< ::wm::VisibilityController> visibility_client;
   scoped_ptr<VirtualKeyboardObserver> virtual_keyboard_observer;
 };
 
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(athena::AthenaEnvState,
                                  kAthenaEnvStateKey,
-                                 NULL);
+                                 nullptr);
 
 // This class observes the change of the virtual keyboard and distribute the
 // change to appropriate modules of athena.
 // TODO(oshima): move the VK bounds logic to screen manager.
 class VirtualKeyboardObserver : public keyboard::KeyboardControllerObserver {
  public:
   VirtualKeyboardObserver() {
     keyboard::KeyboardController::GetInstance()->AddObserver(this);
   }
 
@@ skipping 92 matching lines @@
   athena::SystemUI::Shutdown();
   athena::WindowManager::Shutdown();
   athena::ScreenManager::Shutdown();
   athena::InputManager::Shutdown();
   athena::AthenaEnv::Shutdown();
 
   ShutdownAthenaViewsDelegate();
 }
 
 }  // namespace athena