Moves handful of classes in ash/wm/maximize_mode to ash/common

These classes now only depend upon ash/common. BUG=612629 TEST=covered by tests R=jamescook@chromium.org TBR=jamescook@chromium.org Review-Url: https://codereview.chromium.org/2108223002 Cr-Commit-Position: refs/heads/master@{#402888}
Denger-Network · Jun 29, 2016 · 0be55e6 · 0be55e6
1 parent 4e7d468
commit 0be55e6
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 50 deletions.
diff --git a/ash/ash.gyp b/ash/ash.gyp
@@ -265,6 +265,12 @@
       'common/wm/fullscreen_window_finder.h',
       'common/wm/maximize_mode/maximize_mode_event_handler.cc',
       'common/wm/maximize_mode/maximize_mode_event_handler.h',
+      'common/wm/maximize_mode/maximize_mode_window_manager.cc',
+      'common/wm/maximize_mode/maximize_mode_window_manager.h',
+      'common/wm/maximize_mode/maximize_mode_window_state.cc',
+      'common/wm/maximize_mode/maximize_mode_window_state.h',
+      'common/wm/maximize_mode/workspace_backdrop_delegate.cc',
+      'common/wm/maximize_mode/workspace_backdrop_delegate.h',
       'common/wm/mru_window_tracker.cc',
       'common/wm/mru_window_tracker.h',
       'common/wm/overview/overview_animation_type.h',
@@ -686,17 +692,11 @@
       'wm/maximize_mode/maximize_mode_controller.h',
       'wm/maximize_mode/maximize_mode_event_handler_aura.cc',
       'wm/maximize_mode/maximize_mode_event_handler_aura.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/scoped_disable_internal_mouse_and_keyboard.h',
       'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc',
       'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h',
       'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc',
       'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h',
-      'wm/maximize_mode/workspace_backdrop_delegate.cc',
-      'wm/maximize_mode/workspace_backdrop_delegate.h',
       'wm/overlay_event_filter.cc',
       'wm/overlay_event_filter.h',
       'wm/overview/scoped_overview_animation_settings_aura.cc',

diff --git a/...mize_mode/maximize_mode_window_manager.cc → ...mize_mode/maximize_mode_window_manager.cc b/...mize_mode/maximize_mode_window_manager.cc → ...mize_mode/maximize_mode_window_manager.cc
@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_window_state.h"
+#include "ash/common/wm/maximize_mode/workspace_backdrop_delegate.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm/window_state.h"
@@ -16,8 +18,6 @@
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/common/wm_window_property.h"
-#include "ash/wm/maximize_mode/maximize_mode_window_state.h"
-#include "ash/wm/maximize_mode/workspace_backdrop_delegate.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"

diff --git a/...imize_mode/maximize_mode_window_manager.h → ...imize_mode/maximize_mode_window_manager.h b/...imize_mode/maximize_mode_window_manager.h → ...imize_mode/maximize_mode_window_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
-#define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
+#ifndef ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
+#define ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
 
 #include <stdint.h>
 
@@ -134,4 +134,4 @@ class ASH_EXPORT MaximizeModeWindowManager : public WmWindowObserver,
 
 }  // namespace ash
 
-#endif  // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
+#endif  // ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
diff --git a/...ximize_mode/maximize_mode_window_state.cc → ...ximize_mode/maximize_mode_window_state.cc b/...ximize_mode/maximize_mode_window_state.cc → ...ximize_mode/maximize_mode_window_state.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/wm/maximize_mode/maximize_mode_window_state.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_window_state.h"
 
 #include <utility>
 
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
 #include "ash/common/wm/window_animation_types.h"
 #include "ash/common/wm/window_state_util.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
-#include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/geometry/rect.h"
 

diff --git a/...aximize_mode/maximize_mode_window_state.h → ...aximize_mode/maximize_mode_window_state.h b/...aximize_mode/maximize_mode_window_state.h → ...aximize_mode/maximize_mode_window_state.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_
-#define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_
+#ifndef ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_
+#define ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_
 
 #include <memory>
 
@@ -85,4 +85,4 @@ class MaximizeModeWindowState : public wm::WindowState::State {
 
 }  // namespace ash
 
-#endif  // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_
+#endif  // ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_
diff --git a/...imize_mode/workspace_backdrop_delegate.cc → ...imize_mode/workspace_backdrop_delegate.cc b/...imize_mode/workspace_backdrop_delegate.cc → ...imize_mode/workspace_backdrop_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/wm/maximize_mode/workspace_backdrop_delegate.h"
+#include "ash/common/wm/maximize_mode/workspace_backdrop_delegate.h"
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"

diff --git a/...ximize_mode/workspace_backdrop_delegate.h → ...ximize_mode/workspace_backdrop_delegate.h b/...ximize_mode/workspace_backdrop_delegate.h → ...ximize_mode/workspace_backdrop_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_
-#define ASH_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_
+#ifndef ASH_COMMON_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_
+#define ASH_COMMON_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_
 
 #include <memory>
 
@@ -70,4 +70,4 @@ class ASH_EXPORT WorkspaceBackdropDelegate
 
 }  // namespace ash
 
-#endif  // ASH_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_
+#endif  // ASH_COMMON_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_
diff --git a/ash/shell.cc b/ash/shell.cc
@@ -25,6 +25,7 @@
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/locale/locale_notification_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/common/wm/window_positioner.h"
@@ -70,7 +71,6 @@
 #include "ash/wm/event_client_impl.h"
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
 #include "ash/wm/overlay_event_filter.h"
 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h"
 #include "ash/wm/power_button_controller.h"

diff --git a/ash/wm/maximize_mode/DEPS b/ash/wm/maximize_mode/DEPS
diff --git a/ash/wm/maximize_mode/maximize_mode_controller.cc b/ash/wm/maximize_mode/maximize_mode_controller.cc
@@ -9,10 +9,10 @@
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/common/ash_switches.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
-#include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"

diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
 
 #include <string>
 

diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -11,6 +11,7 @@
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/wm/maximize_mode/workspace_backdrop_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/workspace/workspace_window_resizer.h"
@@ -23,7 +24,6 @@
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
-#include "ash/wm/maximize_mode/workspace_backdrop_delegate.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/compiler_specific.h"

diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
@@ -18,7 +19,6 @@
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"