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

ash/ash.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
   },
   'includes': [
@@ skipping 534 matching lines @@
         'wm/gestures/tray_gesture_handler.h',
         'wm/image_cursors.cc',
         'wm/image_cursors.h',
         'wm/immersive_fullscreen_controller.cc',
         'wm/immersive_fullscreen_controller.h',
         'wm/immersive_revealed_lock.cc',
         'wm/immersive_revealed_lock.h',
         'wm/lock_state_controller.cc',
         'wm/lock_state_controller.h',
         'wm/lock_state_observer.h',
+        'wm/maximize_mode/maximize_mode_controller.cc',
+        'wm/maximize_mode/maximize_mode_controller.h',
         'wm/maximize_mode/maximize_mode_window_manager.cc',
         'wm/maximize_mode/maximize_mode_window_manager.h',
         'wm/maximize_mode/maximize_mode_window_state.cc',
         'wm/maximize_mode/maximize_mode_window_state.h',
         'wm/maximize_mode/workspace_backdrop_delegate.cc',
         'wm/maximize_mode/workspace_backdrop_delegate.h',
         'wm/mru_window_tracker.cc',
         'wm/mru_window_tracker.h',
         'wm/overlay_event_filter.cc',
         'wm/overlay_event_filter.h',
@@ skipping 397 matching lines @@
         'tooltips/tooltip_controller_unittest.cc',
         'touch/touch_observer_hud_unittest.cc',
         'wm/app_list_controller_unittest.cc',
         'wm/ash_native_cursor_manager_unittest.cc',
         'wm/dock/docked_window_layout_manager_unittest.cc',
         'wm/dock/docked_window_resizer_unittest.cc',
         'wm/drag_window_resizer_unittest.cc',
         'wm/gestures/overview_gesture_handler_unittest.cc',
         'wm/immersive_fullscreen_controller_unittest.cc',
         'wm/lock_state_controller_unittest.cc',
+        'wm/maximize_mode/maximize_mode_controller_unittest.cc',
         'wm/maximize_mode/maximize_mode_window_manager_unittest.cc',
         'wm/mru_window_tracker_unittest.cc',
         'wm/overview/window_selector_unittest.cc',
         'wm/panels/panel_layout_manager_unittest.cc',
         'wm/panels/panel_window_resizer_unittest.cc',
         'wm/partial_screenshot_view_unittest.cc',
         'wm/resize_shadow_and_cursor_unittest.cc',
         'wm/screen_dimmer_unittest.cc',
         'wm/stacking_controller_unittest.cc',
         'wm/system_gesture_event_filter_unittest.cc',
@@ skipping 164 matching lines @@
         }],
         ['chromeos==1', {
           'dependencies': [
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
           ],
         }],
       ],
     },
   ],
 }