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

Unified Diff: athena/wm/title_drag_controller.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/split_view_controller_unittest.cc ('k') | athena/wm/window_list_provider_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/title_drag_controller.cc
diff --git a/athena/wm/title_drag_controller.cc b/athena/wm/title_drag_controller.cc
index b41b7fd07f74d2cde97ea6ab43ffa395a1812d74..a0301e101a224c4c14b0b2f33ee70e52335950a3 100644
--- a/athena/wm/title_drag_controller.cc
+++ b/athena/wm/title_drag_controller.cc
@@ -59,7 +59,7 @@ void TitleDragController::EndTransition(aura::Window* window, bool complete) {
void TitleDragController::OnTransitionEnd(aura::Window* window, bool complete) {
weak_ptr_.InvalidateWeakPtrs();
if (!tracker_.Contains(window))
- window = NULL;
+ window = nullptr;
shadow_.reset();
if (window) {
window->SetTransform(gfx::Transform());
« no previous file with comments | « athena/wm/split_view_controller_unittest.cc ('k') | athena/wm/window_list_provider_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698