Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(858)

Unified Diff: athena/wm/split_view_controller.h

Issue 653563004: NULL -> nullptr under athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/wm/bezel_controller.cc ('k') | athena/wm/split_view_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/split_view_controller.h
diff --git a/athena/wm/split_view_controller.h b/athena/wm/split_view_controller.h
index fa87734515ed91b033f17688e9543b9ce3c16b13..2f97745085808fb9f64dfb82dd92028bf26017f3 100644
--- a/athena/wm/split_view_controller.h
+++ b/athena/wm/split_view_controller.h
@@ -48,9 +48,10 @@ class ATHENA_EXPORT SplitViewController
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,
@@ -79,7 +80,7 @@ class ATHENA_EXPORT SplitViewController
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
@@ -140,7 +141,7 @@ class ATHENA_EXPORT SplitViewController
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_;
« no previous file with comments | « athena/wm/bezel_controller.cc ('k') | athena/wm/split_view_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698