summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorvarkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-17 00:23:55 +0000
committervarkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-17 00:23:55 +0000
commit469bfa40032b2696c123dfd5051910a92834b53f (patch)
treec7beae4bc8ea1b37f985337e2c7c2d6517d4e3ef /ash
parent0a5da93a3f48870da33a92094d25a7eebff3af23 (diff)
downloadchromium_src-469bfa40032b2696c123dfd5051910a92834b53f.zip
chromium_src-469bfa40032b2696c123dfd5051910a92834b53f.tar.gz
chromium_src-469bfa40032b2696c123dfd5051910a92834b53f.tar.bz2
Maximize a tab dragged from a maximized window.
BUG=171435 TEST=On Chrome OS drag a tab from a maximized browser. Verify that while dragging the old parent is still visible. Verify that the dragged out tab can be re-parented back into its old parent. Verify that it new browser is also maximized. Confirm on Mac, Windows and Linux. Note: On Window the behavior was correct to begin with. Review URL: https://chromiumcodereview.appspot.com/13957002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200668 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/wm/toplevel_window_event_handler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc
index f2b9d9b..d611354 100644
--- a/ash/wm/toplevel_window_event_handler.cc
+++ b/ash/wm/toplevel_window_event_handler.cc
@@ -117,7 +117,7 @@ void ToplevelWindowEventHandler::ScopedWindowResizer::OnWindowPropertyChanged(
aura::Window* window,
const void* key,
intptr_t old) {
- if (!wm::IsWindowNormal(window))
+ if (key == aura::client::kShowStateKey && !wm::IsWindowNormal(window))
handler_->CompleteDrag(DRAG_COMPLETE, 0);
}