Skip to content

Commit 775aa60

Browse files
jamescookCommit bot
jamescook
authored and
Commit bot
committed
chromeos: Move files in //ash/common to //ash, part 2
Now that mustash can use standard aura windows we don't need the ash/aura vs. ash/mus vs. ash/common distinction. Eliminate //ash/common. Also move files in //ash/common/system/chromeos out to //ash/system because ash only compiles on chromeos these days. Part 2 moves a subset of //ash/common into //ash. The CQ cannot move all the files at once, see https://codereview.chromium.org/2734653002/ BUG=690096 TEST=compiles, ash_unittests TBR=oshima@chromium.org Review-Url: https://codereview.chromium.org/2734683002 Cr-Commit-Position: refs/heads/master@{#454791}
1 parent d2a2b8d commit 775aa60

File tree

588 files changed

+1898
-1907
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

588 files changed

+1898
-1907
lines changed

‎ash/BUILD.gn

+235-235
Large diffs are not rendered by default.

‎ash/common/accelerators/accelerator_commands.cc ‎ash/accelerators/accelerator_commands.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "ash/common/accelerators/accelerator_commands.h"
5+
#include "ash/accelerators/accelerator_commands.h"
66

7-
#include "ash/common/wm/mru_window_tracker.h"
8-
#include "ash/common/wm/window_state.h"
9-
#include "ash/common/wm/wm_event.h"
107
#include "ash/common/wm_shell.h"
118
#include "ash/common/wm_window.h"
9+
#include "ash/wm/mru_window_tracker.h"
10+
#include "ash/wm/window_state.h"
11+
#include "ash/wm/wm_event.h"
1212
#include "base/metrics/user_metrics.h"
1313

1414
namespace ash {

‎ash/common/accelerators/accelerator_commands.h ‎ash/accelerators/accelerator_commands.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_
6-
#define ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_
5+
#ifndef ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_
6+
#define ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_
77

88
#include "ash/ash_export.h"
99

@@ -28,4 +28,4 @@ ASH_EXPORT void ToggleFullscreen();
2828
} // namespace accelerators
2929
} // namespace ash
3030

31-
#endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_
31+
#endif // ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_

‎ash/accelerators/accelerator_commands_aura.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
#include "ash/accelerators/accelerator_commands_aura.h"
66

7-
#include "ash/common/wm/window_state.h"
87
#include "ash/common/wm_window.h"
98
#include "ash/shell.h"
109
#include "ash/wm/screen_pinning_controller.h"
10+
#include "ash/wm/window_state.h"
1111
#include "base/metrics/user_metrics.h"
1212
#include "ui/display/manager/display_manager.h"
1313
#include "ui/display/manager/managed_display_info.h"

‎ash/accelerators/accelerator_commands_unittest.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "ash/common/accelerators/accelerator_commands.h"
5+
#include "ash/accelerators/accelerator_commands.h"
66

77
#include <memory>
88

99
#include "ash/accelerators/accelerator_commands_aura.h"
10-
#include "ash/common/wm/window_state.h"
1110
#include "ash/test/ash_test_base.h"
11+
#include "ash/wm/window_state.h"
1212
#include "ash/wm/window_state_aura.h"
1313
#include "ash/wm/window_util.h"
1414
#include "ui/aura/window.h"

‎ash/common/accelerators/accelerator_controller.cc ‎ash/accelerators/accelerator_controller.cc

+12-12
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "ash/common/accelerators/accelerator_controller.h"
5+
#include "ash/accelerators/accelerator_controller.h"
66

77
#include <utility>
88

9-
#include "ash/common/accelerators/accelerator_commands.h"
10-
#include "ash/common/accelerators/accelerator_controller_delegate.h"
11-
#include "ash/common/accelerators/debug_commands.h"
9+
#include "ash/accelerators/accelerator_commands.h"
10+
#include "ash/accelerators/accelerator_controller_delegate.h"
11+
#include "ash/accelerators/debug_commands.h"
1212
#include "ash/common/accessibility_delegate.h"
1313
#include "ash/common/accessibility_types.h"
1414
#include "ash/common/focus_cycler.h"
@@ -18,19 +18,13 @@
1818
#include "ash/common/new_window_controller.h"
1919
#include "ash/common/palette_delegate.h"
2020
#include "ash/common/session/session_state_delegate.h"
21-
#include "ash/common/shelf/shelf_widget.h"
22-
#include "ash/common/shelf/wm_shelf.h"
2321
#include "ash/common/shell_delegate.h"
24-
#include "ash/common/wm/mru_window_tracker.h"
25-
#include "ash/common/wm/overview/window_selector_controller.h"
26-
#include "ash/common/wm/window_cycle_controller.h"
27-
#include "ash/common/wm/window_positioning_utils.h"
28-
#include "ash/common/wm/window_state.h"
29-
#include "ash/common/wm/wm_event.h"
3022
#include "ash/common/wm_shell.h"
3123
#include "ash/common/wm_window.h"
3224
#include "ash/resources/vector_icons/vector_icons.h"
3325
#include "ash/root_window_controller.h"
26+
#include "ash/shelf/shelf_widget.h"
27+
#include "ash/shelf/wm_shelf.h"
3428
#include "ash/strings/grit/ash_strings.h"
3529
#include "ash/system/brightness_control_delegate.h"
3630
#include "ash/system/ime_menu/ime_menu_tray.h"
@@ -42,6 +36,12 @@
4236
#include "ash/system/tray/system_tray_delegate.h"
4337
#include "ash/system/tray/system_tray_notifier.h"
4438
#include "ash/system/web_notification/web_notification_tray.h"
39+
#include "ash/wm/mru_window_tracker.h"
40+
#include "ash/wm/overview/window_selector_controller.h"
41+
#include "ash/wm/window_cycle_controller.h"
42+
#include "ash/wm/window_positioning_utils.h"
43+
#include "ash/wm/window_state.h"
44+
#include "ash/wm/wm_event.h"
4545
#include "base/metrics/histogram_macros.h"
4646
#include "base/metrics/user_metrics.h"
4747
#include "chromeos/dbus/dbus_thread_manager.h"

‎ash/common/accelerators/accelerator_controller.h ‎ash/accelerators/accelerator_controller.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
6-
#define ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
5+
#ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
6+
#define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
77

88
#include <stddef.h>
99

@@ -12,9 +12,9 @@
1212
#include <set>
1313
#include <vector>
1414

15+
#include "ash/accelerators/accelerator_table.h"
16+
#include "ash/accelerators/exit_warning_handler.h"
1517
#include "ash/ash_export.h"
16-
#include "ash/common/accelerators/accelerator_table.h"
17-
#include "ash/common/accelerators/exit_warning_handler.h"
1818
#include "ash/public/interfaces/accelerator_controller.mojom.h"
1919
#include "base/compiler_specific.h"
2020
#include "base/gtest_prod_util.h"
@@ -231,4 +231,4 @@ class ASH_EXPORT AcceleratorController
231231

232232
} // namespace ash
233233

234-
#endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
234+
#endif // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_

‎ash/common/accelerators/accelerator_controller_delegate.h ‎ash/accelerators/accelerator_controller_delegate.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
6-
#define ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
5+
#ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
6+
#define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
77

8+
#include "ash/accelerators/accelerator_table.h"
89
#include "ash/ash_export.h"
9-
#include "ash/common/accelerators/accelerator_table.h"
1010

1111
namespace ui {
1212
class Accelerator;
@@ -47,4 +47,4 @@ class ASH_EXPORT AcceleratorControllerDelegate {
4747

4848
} // namespace ash
4949

50-
#endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
50+
#endif // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_

‎ash/accelerators/accelerator_controller_delegate_aura.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,10 @@
1010
#include <utility>
1111

1212
#include "ash/accelerators/accelerator_commands_aura.h"
13-
#include "ash/common/accelerators/debug_commands.h"
13+
#include "ash/accelerators/debug_commands.h"
1414
#include "ash/common/accessibility_types.h"
1515
#include "ash/common/session/session_state_delegate.h"
16-
#include "ash/common/shelf/wm_shelf.h"
1716
#include "ash/common/shell_delegate.h"
18-
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
19-
#include "ash/common/wm/window_state.h"
20-
#include "ash/common/wm/wm_event.h"
2117
#include "ash/common/wm_shell.h"
2218
#include "ash/debug.h"
2319
#include "ash/display/display_configuration_controller.h"
@@ -28,14 +24,18 @@
2824
#include "ash/root_window_controller.h"
2925
#include "ash/rotator/window_rotation.h"
3026
#include "ash/screenshot_delegate.h"
27+
#include "ash/shelf/wm_shelf.h"
3128
#include "ash/shell.h"
3229
#include "ash/system/system_notifier.h"
3330
#include "ash/system/tray/system_tray.h"
3431
#include "ash/touch/touch_hud_debug.h"
3532
#include "ash/utility/screenshot_controller.h"
33+
#include "ash/wm/maximize_mode/maximize_mode_controller.h"
3634
#include "ash/wm/power_button_controller.h"
35+
#include "ash/wm/window_state.h"
3736
#include "ash/wm/window_state_aura.h"
3837
#include "ash/wm/window_util.h"
38+
#include "ash/wm/wm_event.h"
3939
#include "base/memory/ptr_util.h"
4040
#include "base/metrics/histogram_macros.h"
4141
#include "base/metrics/user_metrics.h"

‎ash/accelerators/accelerator_controller_delegate_aura.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <memory>
99

10-
#include "ash/common/accelerators/accelerator_controller_delegate.h"
10+
#include "ash/accelerators/accelerator_controller_delegate.h"
1111
#include "base/macros.h"
1212

1313
namespace ash {

‎ash/accelerators/accelerator_controller_unittest.cc

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,14 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "ash/common/accelerators/accelerator_controller.h"
5+
#include "ash/accelerators/accelerator_controller.h"
66

7-
#include "ash/common/accelerators/accelerator_table.h"
7+
#include "ash/accelerators/accelerator_table.h"
88
#include "ash/common/accessibility_delegate.h"
99
#include "ash/common/accessibility_types.h"
1010
#include "ash/common/ash_switches.h"
1111
#include "ash/common/ime_control_delegate.h"
1212
#include "ash/common/session/session_state_delegate.h"
13-
#include "ash/common/test/test_shelf_delegate.h"
14-
#include "ash/common/wm/panels/panel_layout_manager.h"
15-
#include "ash/common/wm/window_positioning_utils.h"
16-
#include "ash/common/wm/window_state.h"
17-
#include "ash/common/wm/wm_event.h"
1813
#include "ash/common/wm_shell.h"
1914
#include "ash/common/wm_window.h"
2015
#include "ash/public/cpp/shell_window_ids.h"
@@ -26,9 +21,14 @@
2621
#include "ash/test/lock_state_controller_test_api.h"
2722
#include "ash/test/test_screenshot_delegate.h"
2823
#include "ash/test/test_session_state_animator.h"
24+
#include "ash/test/test_shelf_delegate.h"
2925
#include "ash/wm/lock_state_controller.h"
26+
#include "ash/wm/panels/panel_layout_manager.h"
27+
#include "ash/wm/window_positioning_utils.h"
28+
#include "ash/wm/window_state.h"
3029
#include "ash/wm/window_state_aura.h"
3130
#include "ash/wm/window_util.h"
31+
#include "ash/wm/wm_event.h"
3232
#include "base/command_line.h"
3333
#include "base/test/user_action_tester.cc"
3434
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"

‎ash/accelerators/accelerator_delegate.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "ash/accelerators/accelerator_delegate.h"
66

7-
#include "ash/common/accelerators/accelerator_router.h"
7+
#include "ash/accelerators/accelerator_router.h"
88
#include "ash/common/wm_window.h"
99
#include "ui/aura/window.h"
1010
#include "ui/events/event.h"

‎ash/accelerators/accelerator_filter_unittest.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66

77
#include <memory>
88

9+
#include "ash/accelerators/accelerator_controller.h"
910
#include "ash/accelerators/accelerator_delegate.h"
10-
#include "ash/common/accelerators/accelerator_controller.h"
11-
#include "ash/common/test/test_session_state_delegate.h"
12-
#include "ash/common/wm/window_state.h"
1311
#include "ash/common/wm_shell.h"
1412
#include "ash/public/cpp/shell_window_ids.h"
1513
#include "ash/shell.h"
1614
#include "ash/test/ash_test_base.h"
1715
#include "ash/test/ash_test_helper.h"
1816
#include "ash/test/test_screenshot_delegate.h"
17+
#include "ash/test/test_session_state_delegate.h"
18+
#include "ash/wm/window_state.h"
1919
#include "ash/wm/window_state_aura.h"
2020
#include "ash/wm/window_util.h"
2121
#include "testing/gtest/include/gtest/gtest.h"

‎ash/accelerators/accelerator_interactive_uitest_chromeos.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "ash/common/accelerators/accelerator_controller.h"
5+
#include "ash/accelerators/accelerator_controller.h"
66

77
#include "ash/common/shell_observer.h"
8-
#include "ash/common/wm/window_state.h"
98
#include "ash/common/wm_shell.h"
109
#include "ash/shell.h"
1110
#include "ash/system/network/network_observer.h"
1211
#include "ash/system/tray/system_tray_delegate.h"
1312
#include "ash/system/tray/system_tray_notifier.h"
1413
#include "ash/test/ash_interactive_ui_test_base.h"
1514
#include "ash/test/test_screenshot_delegate.h"
15+
#include "ash/wm/window_state.h"
1616
#include "ash/wm/window_state_aura.h"
1717
#include "ash/wm/window_util.h"
1818
#include "base/run_loop.h"

‎ash/common/accelerators/accelerator_router.cc ‎ash/accelerators/accelerator_router.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "ash/common/accelerators/accelerator_router.h"
5+
#include "ash/accelerators/accelerator_router.h"
66

7-
#include "ash/common/accelerators/accelerator_controller.h"
8-
#include "ash/common/wm/window_state.h"
7+
#include "ash/accelerators/accelerator_controller.h"
98
#include "ash/common/wm_shell.h"
109
#include "ash/common/wm_window.h"
10+
#include "ash/wm/window_state.h"
1111
#include "base/metrics/histogram_macros.h"
1212
#include "base/stl_util.h"
1313
#include "ui/base/accelerators/accelerator.h"

‎ash/common/accelerators/accelerator_router.h ‎ash/accelerators/accelerator_router.h

File renamed without changes.

‎ash/common/accelerators/accelerator_table.cc ‎ash/accelerators/accelerator_table.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "ash/common/accelerators/accelerator_table.h"
5+
#include "ash/accelerators/accelerator_table.h"
66

77
#include "ash/strings/grit/ash_strings.h"
88
#include "base/macros.h"

‎ash/common/accelerators/accelerator_table.h ‎ash/accelerators/accelerator_table.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_
6-
#define ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_
5+
#ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
6+
#define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
77

88
#include <stddef.h>
99

@@ -261,4 +261,4 @@ ASH_EXPORT extern const size_t kActionsKeepingMenuOpenLength;
261261

262262
} // namespace ash
263263

264-
#endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_
264+
#endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_

‎ash/common/accelerators/accelerator_table_unittest.cc ‎ash/accelerators/accelerator_table_unittest.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include <set>
66

7-
#include "ash/common/accelerators/accelerator_table.h"
7+
#include "ash/accelerators/accelerator_table.h"
88
#include "base/strings/string_util.h"
99
#include "testing/gtest/include/gtest/gtest.h"
1010

‎ash/common/accelerators/ash_focus_manager_factory.cc ‎ash/accelerators/ash_focus_manager_factory.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "ash/common/accelerators/ash_focus_manager_factory.h"
5+
#include "ash/accelerators/ash_focus_manager_factory.h"
66

7-
#include "ash/common/accelerators/accelerator_controller.h"
7+
#include "ash/accelerators/accelerator_controller.h"
88
#include "ash/common/wm_shell.h"
99
#include "base/memory/ptr_util.h"
1010
#include "ui/views/focus/focus_manager.h"

‎ash/common/accelerators/ash_focus_manager_factory.h ‎ash/accelerators/ash_focus_manager_factory.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
6-
#define ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
5+
#ifndef ASH_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
6+
#define ASH_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
77

88
#include "base/macros.h"
99
#include "ui/views/focus/focus_manager_delegate.h"
@@ -35,4 +35,4 @@ class AshFocusManagerFactory : public views::FocusManagerFactory {
3535

3636
} // namespace ash
3737

38-
#endif // ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
38+
#endif // ASH_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_

‎ash/common/accelerators/debug_commands.cc ‎ash/accelerators/debug_commands.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "ash/common/accelerators/debug_commands.h"
5+
#include "ash/accelerators/debug_commands.h"
66

7-
#include "ash/common/accelerators/accelerator_commands.h"
7+
#include "ash/accelerators/accelerator_commands.h"
88
#include "ash/common/ash_switches.h"
99
#include "ash/common/shell_delegate.h"
1010
#include "ash/common/wallpaper/wallpaper_controller.h"
1111
#include "ash/common/wallpaper/wallpaper_delegate.h"
12-
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
1312
#include "ash/common/wm_shell.h"
1413
#include "ash/common/wm_window.h"
1514
#include "ash/root_window_controller.h"
1615
#include "ash/system/toast/toast_data.h"
1716
#include "ash/system/toast/toast_manager.h"
17+
#include "ash/wm/maximize_mode/maximize_mode_controller.h"
1818
#include "ash/wm/window_properties.h"
1919
#include "base/command_line.h"
2020
#include "base/metrics/user_metrics.h"

0 commit comments

Comments
 (0)