| Index: ash/shell.h
|
| diff --git a/ash/shell.h b/ash/shell.h
|
| index bc84e1892ad95e2dc76a3c5e92becddfcabeaa05..d506f876536919dd14b9b15372f719d2ea668a2a 100644
|
| --- a/ash/shell.h
|
| +++ b/ash/shell.h
|
| @@ -102,6 +102,7 @@ class LocaleNotificationController;
|
| class LockStateController;
|
| class LogoutConfirmationController;
|
| class MagnificationController;
|
| +class MaximizeModeController;
|
| class MaximizeModeWindowManager;
|
| class MediaDelegate;
|
| class MouseCursorEventFilter;
|
| @@ -496,6 +497,10 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
|
| return accelerometer_controller_.get();
|
| }
|
|
|
| + MaximizeModeController* maximize_mode_controller() {
|
| + return maximize_mode_controller_.get();
|
| + }
|
| +
|
| #if defined(OS_CHROMEOS)
|
| // TODO(oshima): Move these objects to DisplayController.
|
| ui::OutputConfigurator* output_configurator() {
|
| @@ -719,6 +724,8 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
|
| #endif // defined(USE_X11)
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| + scoped_ptr<MaximizeModeController> maximize_mode_controller_;
|
| +
|
| // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a
|
| // pointer to vend to test code.
|
| AshNativeCursorManager* native_cursor_manager_;
|
|
|