summaryrefslogtreecommitdiffstats
path: root/ui/views/widget
diff options
context:
space:
mode:
authordbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 05:10:59 +0000
committerdbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 05:10:59 +0000
commit3212d395332e1da75dc8624412303d6b15f9926b (patch)
tree9c7d1049d2198a2465474a91b69d7431dd245a83 /ui/views/widget
parent56b4dd97a2ff7472321696c2008ff9e578bddcb1 (diff)
downloadchromium_src-3212d395332e1da75dc8624412303d6b15f9926b.zip
chromium_src-3212d395332e1da75dc8624412303d6b15f9926b.tar.gz
chromium_src-3212d395332e1da75dc8624412303d6b15f9926b.tar.bz2
Revert 118057 - Add a simple animation when showing/hiding windows.
http://crbug.com/110024 TEST=none Review URL: http://codereview.chromium.org/9167032 TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9249009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118060 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/widget')
-rw-r--r--ui/views/widget/native_widget_aura.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index a1cd88a..f997344 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -45,9 +45,8 @@ aura::client::WindowType GetAuraWindowTypeForWidgetType(
return aura::client::WINDOW_TYPE_NORMAL;
case Widget::InitParams::TYPE_PANEL:
return aura::client::WINDOW_TYPE_PANEL;
- case Widget::InitParams::TYPE_CONTROL:
- return aura::client::WINDOW_TYPE_CONTROL;
case Widget::InitParams::TYPE_WINDOW_FRAMELESS:
+ case Widget::InitParams::TYPE_CONTROL:
case Widget::InitParams::TYPE_POPUP:
case Widget::InitParams::TYPE_BUBBLE:
return aura::client::WINDOW_TYPE_POPUP;