diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 20:37:00 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 20:37:00 +0000 |
commit | 86f2b5e1870debcf167d3a9c8901541db279406b (patch) | |
tree | 4f828329ad8b07293370402e7d76457af7a714c4 /ash/shell.h | |
parent | 31882ba1222e0f89e2712d174879dacd4525e64c (diff) | |
download | chromium_src-86f2b5e1870debcf167d3a9c8901541db279406b.zip chromium_src-86f2b5e1870debcf167d3a9c8901541db279406b.tar.gz chromium_src-86f2b5e1870debcf167d3a9c8901541db279406b.tar.bz2 |
Move shadow code to views\corewm
http://crbug.com/158115
R=derat@chromium.org
Review URL: https://codereview.chromium.org/11275296
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r-- | ash/shell.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/shell.h b/ash/shell.h index 38fd7e7..7c0c281 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -56,6 +56,7 @@ class Widget; namespace corewm { class CompoundEventFilter; class InputMethodEventFilter; +class ShadowController; } } @@ -101,7 +102,6 @@ class ResizeShadowController; class RootWindowController; class RootWindowLayoutManager; class ScreenPositionController; -class ShadowController; class SlowAnimationEventFilter; class StatusAreaWidget; class SystemGestureEventFilter; @@ -391,7 +391,7 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate, } // Made available for tests. - internal::ShadowController* shadow_controller() { + views::corewm::ShadowController* shadow_controller() { return shadow_controller_.get(); } @@ -482,7 +482,7 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate, scoped_ptr<internal::WindowModalityController> window_modality_controller_; scoped_ptr<internal::DragDropController> drag_drop_controller_; scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_; - scoped_ptr<internal::ShadowController> shadow_controller_; + scoped_ptr<views::corewm::ShadowController> shadow_controller_; scoped_ptr<internal::TooltipController> tooltip_controller_; scoped_ptr<internal::VisibilityController> visibility_controller_; scoped_ptr<DesktopBackgroundController> desktop_background_controller_; |