| Index: ash/shell.h
|
| diff --git a/ash/shell.h b/ash/shell.h
|
| index 3f0841a0f2556a176e3963e6212691b00e1d1e79..40c9d8e36c9778ae081d4843a2ec798297138670 100644
|
| --- a/ash/shell.h
|
| +++ b/ash/shell.h
|
| @@ -130,6 +130,7 @@ class KeyboardUMAEventFilter;
|
| class LastWindowClosedLogoutReminder;
|
| class LocaleNotificationController;
|
| class LogoutConfirmationController;
|
| +class MaximizeModeController;
|
| class MaximizeModeWindowManager;
|
| class MouseCursorEventFilter;
|
| class OutputConfiguratorAnimation;
|
| @@ -505,6 +506,10 @@ class ASH_EXPORT Shell
|
| return accelerometer_controller_.get();
|
| }
|
|
|
| + internal::MaximizeModeController* maximize_mode_controller() {
|
| + return maximize_mode_controller_.get();
|
| + }
|
| +
|
| #if defined(OS_CHROMEOS)
|
| // TODO(oshima): Move these objects to DisplayController.
|
| ui::OutputConfigurator* output_configurator() {
|
| @@ -732,6 +737,8 @@ class ASH_EXPORT Shell
|
| #endif // defined(USE_X11)
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| + scoped_ptr<internal::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_;
|
|
|