NULL -> nullptr under athena/

athena/wm/bezel_controller.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/wm/bezel_controller.h"
 
 #include "ui/aura/window.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/point_conversions.h"
@@ skipping 49 matching lines @@
     return BezelController::BEZEL_RIGHT;
   return BezelController::BEZEL_NONE;
 }
 
 }  // namespace
 
 BezelController::BezelController(aura::Window* container)
     : container_(container),
       state_(NONE),
       scroll_bezel_(BEZEL_NONE),
-      scroll_target_(NULL),
-      left_right_delegate_(NULL) {
+      scroll_target_(nullptr),
+      left_right_delegate_(nullptr) {
 }
 
 void BezelController::SetState(BezelController::State state) {
   // Use SetState(State, float) if |state| is one of the BEZEL_SCROLLING states.
   DCHECK_NE(state, BEZEL_SCROLLING_TWO_FINGERS);
   DCHECK_NE(state, BEZEL_SCROLLING_ONE_FINGER);
   SetState(state, kScrollDeltaNone);
 }
 
 void BezelController::SetState(BezelController::State state,
                                float scroll_delta) {
   if (!left_right_delegate_ || state == state_)
     return;
 
   State old_state = state_;
   state_ = state;
 
   if (state == NONE) {
     scroll_bezel_ = BEZEL_NONE;
-    scroll_target_ = NULL;
+    scroll_target_ = nullptr;
   }
 
   if (state == BEZEL_SCROLLING_TWO_FINGERS) {
     left_right_delegate_->BezelScrollBegin(scroll_bezel_, scroll_delta);
   } else if (old_state == BEZEL_SCROLLING_TWO_FINGERS) {
     // If BezelScrollEnd() hides |scroll_target_|, ET_GESTURE_END is dispatched
     // and we get a reentrant call to SetState().
     left_right_delegate_->BezelScrollEnd(0.0f);
   }
 }
@@ skipping 98 matching lines @@
     if (state_ != BEZEL_SCROLLING_TWO_FINGERS)
       return;
 
     left_right_delegate_->BezelScrollUpdate(scroll_delta);
     if (left_right_delegate_->BezelCanScroll())
       event->SetHandled();
   }
 }
 
 }  // namespace athena