| Index: ash/shell.h
|
| diff --git a/ash/shell.h b/ash/shell.h
|
| index 7c0c281ff1f98a27105f6c5db1f72d74e99d4291..db67eb63785a6ee9998c6437d310fe73927e7ef1 100644
|
| --- a/ash/shell.h
|
| +++ b/ash/shell.h
|
| @@ -68,7 +68,9 @@ class DesktopBackgroundController;
|
| class DisplayController;
|
| class HighContrastController;
|
| class Launcher;
|
| +class MagnificationController;
|
| class NestedDispatcherController;
|
| +class PartialMagnificationController;
|
| class PowerButtonController;
|
| class ScreenAsh;
|
| class SessionStateController;
|
| @@ -94,7 +96,6 @@ class DragDropController;
|
| class EventClientImpl;
|
| class EventRewriterEventFilter;
|
| class FocusCycler;
|
| -class MagnificationController;
|
| class MouseCursorEventFilter;
|
| class OutputConfiguratorAnimation;
|
| class OverlayEventFilter;
|
| @@ -323,10 +324,14 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
|
| return high_contrast_controller_.get();
|
| }
|
|
|
| - internal::MagnificationController* magnification_controller() {
|
| + MagnificationController* magnification_controller() {
|
| return magnification_controller_.get();
|
| }
|
|
|
| + PartialMagnificationController* partial_magnification_controller() {
|
| + return partial_magnification_controller_.get();
|
| + }
|
| +
|
| ScreenAsh* screen() { return screen_; }
|
|
|
| // Force the shelf to query for it's current visibility state.
|
| @@ -494,7 +499,8 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
|
| scoped_ptr<internal::FocusCycler> focus_cycler_;
|
| scoped_ptr<DisplayController> display_controller_;
|
| scoped_ptr<HighContrastController> high_contrast_controller_;
|
| - scoped_ptr<internal::MagnificationController> magnification_controller_;
|
| + scoped_ptr<MagnificationController> magnification_controller_;
|
| + scoped_ptr<PartialMagnificationController> partial_magnification_controller_;
|
| scoped_ptr<aura::FocusManager> focus_manager_;
|
| scoped_ptr<aura::client::UserActionClient> user_action_client_;
|
| scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
|
|
|