Merge 261645 "Enable maximize mode when keyboard is open past 18..."

ash/shell.h

Index: ash/shell.h
===================================================================
--- ash/shell.h	(revision 263398)
+++ ash/shell.h	(working copy)
@@ -85,6 +85,7 @@
 class HighContrastController;
 class LockStateController;
 class MagnificationController;
+class MaximizeModeController;
 class MediaDelegate;
 class MruWindowTracker;
 class NestedDispatcherController;
@@ -505,6 +506,10 @@
     return accelerometer_controller_.get();
   }
 
+  MaximizeModeController* maximize_mode_controller() {
+    return maximize_mode_controller_.get();
+  }
+
 #if defined(OS_CHROMEOS)
 #if defined(USE_X11)
   // TODO(oshima): Move these objects to DisplayController.
@@ -735,6 +740,8 @@
 #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_;