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

Unified Diff: athena/wm/window_manager_impl.cc

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/window_list_provider_impl_unittest.cc ('k') | athena/wm/window_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/window_manager_impl.cc
diff --git a/athena/wm/window_manager_impl.cc b/athena/wm/window_manager_impl.cc
index f0020c47bc14f2917b393ef529fa78e96819cb0a..99b2ec1acf75f47a26104c7a3a0e95f5c2e779bd 100644
--- a/athena/wm/window_manager_impl.cc
+++ b/athena/wm/window_manager_impl.cc
@@ -31,7 +31,7 @@
namespace athena {
namespace {
-class WindowManagerImpl* instance = NULL;
+class WindowManagerImpl* instance = nullptr;
void SetWindowState(aura::Window* window,
const gfx::Rect& bounds,
@@ -185,7 +185,7 @@ WindowManagerImpl::~WindowManagerImpl() {
// |title_drag_controller_| needs to be reset before |container_|.
title_drag_controller_.reset();
container_.reset();
- instance = NULL;
+ instance = nullptr;
}
void WindowManagerImpl::ToggleSplitView() {
@@ -201,7 +201,7 @@ void WindowManagerImpl::ToggleSplitView() {
FOR_EACH_OBSERVER(WindowManagerObserver,
observers_,
OnSplitViewModeEnter());
- split_view_controller_->ActivateSplitMode(NULL, NULL, NULL);
+ split_view_controller_->ActivateSplitMode(nullptr, nullptr, nullptr);
}
}
@@ -209,7 +209,7 @@ void WindowManagerImpl::EnterOverview() {
if (IsOverviewModeActive())
return;
- bezel_controller_->set_left_right_delegate(NULL);
+ bezel_controller_->set_left_right_delegate(nullptr);
FOR_EACH_OBSERVER(WindowManagerObserver, observers_, OnOverviewModeEnter());
// Note: The window_list_provider_ resembles the exact window list of the
@@ -370,7 +370,7 @@ aura::Window* WindowManagerImpl::GetWindowBehind(aura::Window* window) {
std::find(windows.rbegin(), windows.rend(), window);
CHECK(iter != windows.rend());
++iter;
- aura::Window* behind = NULL;
+ aura::Window* behind = nullptr;
if (iter != windows.rend())
behind = *iter++;
@@ -379,7 +379,7 @@ aura::Window* WindowManagerImpl::GetWindowBehind(aura::Window* window) {
aura::Window* right = split_view_controller_->right_window();
CHECK(window == left || window == right);
if (behind == left || behind == right)
- behind = (iter == windows.rend()) ? NULL : *iter;
+ behind = (iter == windows.rend()) ? nullptr : *iter;
}
return behind;
« no previous file with comments | « athena/wm/window_list_provider_impl_unittest.cc ('k') | athena/wm/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698