summaryrefslogtreecommitdiffstats
path: root/ui/views/widget/root_view.cc
diff options
context:
space:
mode:
authorvarkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-30 01:05:40 +0000
committervarkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-30 01:05:40 +0000
commit47491adcc933301b33e7f8605f1b0ba6ba31aafb (patch)
treea011b4fcf2e86502df17bcf098d1cc323178b8cd /ui/views/widget/root_view.cc
parent8c79e3f62dacd2753a596b10264f941185644a5e (diff)
downloadchromium_src-47491adcc933301b33e7f8605f1b0ba6ba31aafb.zip
chromium_src-47491adcc933301b33e7f8605f1b0ba6ba31aafb.tar.gz
chromium_src-47491adcc933301b33e7f8605f1b0ba6ba31aafb.tar.bz2
Not moving a docked window when restoring a previously maximized window. When a maximized window gets docked (possible with a secondary monitor - see bug steps to repro) it now gets restored first. This prevents weird animated behavior or hiding it when it gets undocked or restored.
Additionally a tab dragged out of a maximized browser and docked is not maximized anymore at the end of the drag (this used to be causing it to get undocked immediately). BUG=309954 BUG=305276 TEST=interactive_ui_tests --gtest_filter=*TabDragControllerTest*DetachToDockedWindowFromMaximizedWindow* Review URL: https://codereview.chromium.org/38073004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/widget/root_view.cc')
-rw-r--r--ui/views/widget/root_view.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/views/widget/root_view.cc b/ui/views/widget/root_view.cc
index e29ced9..95f94dc 100644
--- a/ui/views/widget/root_view.cc
+++ b/ui/views/widget/root_view.cc
@@ -639,6 +639,7 @@ void RootView::VisibilityChanged(View* /*starting_from*/, bool is_visible) {
// When the root view is being hidden (e.g. when widget is minimized)
// handlers are reset, so that after it is reshown, events are not captured
// by old handlers.
+ explicit_mouse_handler_ = false;
mouse_pressed_handler_ = NULL;
mouse_move_handler_ = NULL;
touch_pressed_handler_ = NULL;