summaryrefslogtreecommitdiffstats
path: root/ash/wm
diff options
context:
space:
mode:
authorprasadt@chromium.org <prasadt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-27 21:42:19 +0000
committerprasadt@chromium.org <prasadt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-27 21:42:19 +0000
commitdb6b517beeb6de98960681b028ad761e331cc145 (patch)
tree07dff6ce3c656f3f5913af2dbf043d44ff56bd8e /ash/wm
parentd583e3f2463dd1d216c92923e2eb9a9ba6066676 (diff)
downloadchromium_src-db6b517beeb6de98960681b028ad761e331cc145.zip
chromium_src-db6b517beeb6de98960681b028ad761e331cc145.tar.gz
chromium_src-db6b517beeb6de98960681b028ad761e331cc145.tar.bz2
Bypass ToplevelWindowEventFilter for panels.
With this change minimize and drag work on panels in Aura. BUG=108497 TEST=Run chrome in aura. Create a panel. Click on titlebar. Drag. Review URL: http://codereview.chromium.org/9027020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
-rw-r--r--ash/wm/shadow_controller.cc1
-rw-r--r--ash/wm/stacking_controller.cc2
2 files changed, 3 insertions, 0 deletions
diff --git a/ash/wm/shadow_controller.cc b/ash/wm/shadow_controller.cc
index 539596f..6f5a530 100644
--- a/ash/wm/shadow_controller.cc
+++ b/ash/wm/shadow_controller.cc
@@ -25,6 +25,7 @@ namespace {
ShadowType GetShadowTypeFromWindowType(aura::Window* window) {
switch (window->type()) {
case aura::client::WINDOW_TYPE_NORMAL:
+ case aura::client::WINDOW_TYPE_PANEL:
return CommandLine::ForCurrentProcess()->HasSwitch(
switches::kAuraTranslucentFrames) ?
SHADOW_TYPE_NONE : SHADOW_TYPE_RECTANGULAR;
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
index 6433bb1..570aa77 100644
--- a/ash/wm/stacking_controller.cc
+++ b/ash/wm/stacking_controller.cc
@@ -50,6 +50,8 @@ aura::Window* StackingController::GetDefaultParent(aura::Window* window) {
if (IsWindowModal(window))
return GetModalContainer(window);
return always_on_top_controller_->GetContainer(window);
+ case aura::client::WINDOW_TYPE_PANEL:
+ return GetContainer(internal::kShellWindowId_PanelContainer);
case aura::client::WINDOW_TYPE_MENU:
case aura::client::WINDOW_TYPE_TOOLTIP:
return GetContainer(internal::kShellWindowId_MenusAndTooltipsContainer);