| Index: ash/shell.h
|
| ===================================================================
|
| --- ash/shell.h (revision 167460)
|
| +++ ash/shell.h (working copy)
|
| @@ -55,6 +55,7 @@
|
| namespace corewm {
|
| class CompoundEventFilter;
|
| class InputMethodEventFilter;
|
| +class ShadowController;
|
| }
|
| }
|
|
|
| @@ -97,7 +98,6 @@
|
| class RootWindowController;
|
| class RootWindowLayoutManager;
|
| class ScreenPositionController;
|
| -class ShadowController;
|
| class SlowAnimationEventFilter;
|
| class StackingController;
|
| class StatusAreaWidget;
|
| @@ -381,7 +381,7 @@
|
| }
|
|
|
| // Made available for tests.
|
| - internal::ShadowController* shadow_controller() {
|
| + views::corewm::ShadowController* shadow_controller() {
|
| return shadow_controller_.get();
|
| }
|
|
|
| @@ -469,7 +469,7 @@
|
| 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_;
|
|
|