NULL -> nullptr under athena/

athena/wm/split_view_controller.h

 // 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.
 
 #ifndef ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_
 #define ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_
 
 #include "athena/athena_export.h"
 #include "athena/util/drag_handle.h"
 #include "athena/wm/bezel_controller.h"
@@ skipping 30 matching lines @@
  public:
   SplitViewController(aura::Window* container,
                       WindowListProvider* window_list_provider);
 
   virtual ~SplitViewController();
 
   bool CanActivateSplitViewMode() const;
   bool IsSplitViewModeActive() const;
 
   // Activates split-view mode with |left| and |right| windows. If |left| and/or
-  // |right| is NULL, then the first window in the window-list (which is neither
+  // |right| is nullptr, then the first window in the window-list (which is
+  // neither
   // |left| nor |right|) is selected instead. |to_activate| indicates which of
-  // |left| or |right| should be activated. If |to_activate| is NULL, the
+  // |left| or |right| should be activated. If |to_activate| is nullptr, the
   // currently active window is kept active if it is one of the split-view
   // windows.
   void ActivateSplitMode(aura::Window* left,
                          aura::Window* right,
                          aura::Window* to_activate);
 
   // Resets the internal state to an inactive state.
   void DeactivateSplitMode();
 
   // Replaces |window| in split-view mode with |replace_with|. Adjusts
   // |replace_with|'s visibility, transform and bounds. Resets |window|'s
   // visibility and transform but does not change its bounds.
   void ReplaceWindow(aura::Window* window,
                      aura::Window* replace_with);
 
   // Returns the bounds of the left and right parts of the |container_| based
   // on the current value of |divider_position_|.
   gfx::Rect GetLeftAreaBounds();
   gfx::Rect GetRightAreaBounds();
 
   aura::Window* left_window() { return left_window_; }
   aura::Window* right_window() { return right_window_; }
 
  private:
   friend class SplitViewControllerTest;
 
   enum State {
     // Split View mode is not active. |left_window_| and |right_window| are
-    // NULL.
+    // nullptr.
     INACTIVE,
     // Two windows |left_window_| and |right_window| are shown side by side and
     // there is a horizontal scroll in progress which is dragging the divider
     // between the two windows.
     SCROLLING,
     // Split View mode is active with |left_window_| and |right_window| showing
     // side by side each occupying half the screen. No scroll in progress.
     ACTIVE
   };
 
@@ skipping 40 matching lines @@
   virtual void OnSplitViewModeExit() override;
 
   State state_;
 
   aura::Window* container_;
 
   // Provider of the list of windows to cycle through. Not owned.
   WindowListProvider* window_list_provider_;
 
   // Windows for the left and right activities shown in SCROLLING and ACTIVE
-  // states. In INACTIVE state these are NULL.
+  // states. In INACTIVE state these are nullptr.
   aura::Window* left_window_;
   aura::Window* right_window_;
 
   // X-Coordinate of the (center of the) divider between left_window_ and
   // right_window_ in |container_| coordinates.
   int divider_position_;
 
   // Meaningful only when state_ is SCROLLING.
   // X-Coordinate of the divider when the scroll started.
   int divider_scroll_start_position_;
@@ skipping 13 matching lines @@
   std::vector<aura::Window*> to_hide_;
 
   base::WeakPtrFactory<SplitViewController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SplitViewController);
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_