diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 22:43:23 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 22:43:23 +0000 |
| commit | 37167d33709da8f73acd4a8f0e1577ed72a359f2 (patch) | |
| tree | 22e579808f550d75ff08adef93336ae5e4d010ca /ash/shell.cc | |
| parent | 56721c912f3725ab3b7fb341809991ce41dafab5 (diff) | |
| download | chromium_src-37167d33709da8f73acd4a8f0e1577ed72a359f2.zip chromium_src-37167d33709da8f73acd4a8f0e1577ed72a359f2.tar.gz chromium_src-37167d33709da8f73acd4a8f0e1577ed72a359f2.tar.bz2 | |
Revert 127268 - Ash: Add resize border shadow effect
* Add ResizeShadow that uses solid-color layers to draw the resize border shadow effect.
* Add ResizeShadowController to create ResizeShadows and track bounds changes for windows.
* Wire both into ToplevelWindowEventFilter to track mouse move/enter events near (but not inside) the window frame.
BUG=118325
TEST=visual, hover mouse near window edges, drag windows
Review URL: https://chromiumcodereview.appspot.com/9677070
TBR=jamescook@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9724005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127277 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 971597f..5aec3bd 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -39,7 +39,6 @@ #include "ash/wm/panel_layout_manager.h" #include "ash/wm/partial_screenshot_event_filter.h" #include "ash/wm/power_button_controller.h" -#include "ash/wm/resize_shadow_controller.h" #include "ash/wm/root_window_event_filter.h" #include "ash/wm/root_window_layout_manager.h" #include "ash/wm/shadow_controller.h" @@ -444,7 +443,6 @@ Shell::~Shell() { // Alphabetical. activation_controller_.reset(); drag_drop_controller_.reset(); - resize_shadow_controller_.reset(); shadow_controller_.reset(); window_cycle_controller_.reset(); @@ -582,10 +580,8 @@ void Shell::Init() { InitLayoutManagers(); - if (!command_line->HasSwitch(switches::kAuraNoShadows)) { - resize_shadow_controller_.reset(new internal::ResizeShadowController()); + if (!command_line->HasSwitch(switches::kAuraNoShadows)) shadow_controller_.reset(new internal::ShadowController()); - } focus_cycler_.reset(new internal::FocusCycler()); focus_cycler_->AddWidget(status_widget_); |