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

Unified Diff: athena/wm/split_view_controller.cc

Issue 465983002: Add shoftcut (ctrl-f6) to toggle split view (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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/test/athena_test_base.cc ('k') | athena/wm/window_manager_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/split_view_controller.cc
diff --git a/athena/wm/split_view_controller.cc b/athena/wm/split_view_controller.cc
index 232908994061e8095463a1847ce018e492d8c5b4..cf39f2e0c60d44af99ccb6f571a4192a13640a48 100644
--- a/athena/wm/split_view_controller.cc
+++ b/athena/wm/split_view_controller.cc
@@ -163,6 +163,9 @@ void SplitViewController::SetWindowTransform(aura::Window* window,
}
void SplitViewController::OnAnimationCompleted(aura::Window* window) {
+ // Animation can be cancelled when deactivated.
+ if (left_window_ == NULL)
+ return;
DCHECK(window == left_window_ || window == right_window_);
if (state_ == ACTIVE) {
gfx::Rect window_bounds = gfx::Rect(container_->bounds().size());
« no previous file with comments | « athena/test/athena_test_base.cc ('k') | athena/wm/window_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698