Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Side by Side Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/metrics/user_metrics_recorder.cc ('k') | ash/mus/network_connect_delegate_mus.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/mus/bridge/wm_shell_mus.h" 5 #include "ash/mus/bridge/wm_shell_mus.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/accelerators/accelerator_controller.h" 9 #include "ash/common/accelerators/accelerator_controller.h"
10 #include "ash/common/key_event_watcher.h" 10 #include "ash/common/key_event_watcher.h"
11 #include "ash/common/session/session_state_delegate.h" 11 #include "ash/common/session/session_state_delegate.h"
12 #include "ash/common/shell_delegate.h" 12 #include "ash/common/shell_delegate.h"
13 #include "ash/common/shell_observer.h" 13 #include "ash/common/shell_observer.h"
14 #include "ash/common/system/tray/system_tray_delegate.h"
15 #include "ash/common/wallpaper/wallpaper_delegate.h" 14 #include "ash/common/wallpaper/wallpaper_delegate.h"
16 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h" 15 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
17 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h" 16 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h"
18 #include "ash/common/wm/mru_window_tracker.h" 17 #include "ash/common/wm/mru_window_tracker.h"
19 #include "ash/common/wm/window_cycle_event_filter.h" 18 #include "ash/common/wm/window_cycle_event_filter.h"
20 #include "ash/common/wm/window_resizer.h" 19 #include "ash/common/wm/window_resizer.h"
21 #include "ash/common/wm_window.h" 20 #include "ash/common/wm_window.h"
22 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h" 21 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h"
23 #include "ash/mus/accelerators/accelerator_controller_registrar.h" 22 #include "ash/mus/accelerators/accelerator_controller_registrar.h"
24 #include "ash/mus/bridge/immersive_handler_factory_mus.h" 23 #include "ash/mus/bridge/immersive_handler_factory_mus.h"
25 #include "ash/mus/bridge/workspace_event_handler_mus.h" 24 #include "ash/mus/bridge/workspace_event_handler_mus.h"
26 #include "ash/mus/drag_window_resizer.h" 25 #include "ash/mus/drag_window_resizer.h"
27 #include "ash/mus/keyboard_ui_mus.h" 26 #include "ash/mus/keyboard_ui_mus.h"
28 #include "ash/mus/screen_mus.h" 27 #include "ash/mus/screen_mus.h"
29 #include "ash/mus/window_manager.h" 28 #include "ash/mus/window_manager.h"
30 #include "ash/root_window_controller.h" 29 #include "ash/root_window_controller.h"
31 #include "ash/root_window_settings.h" 30 #include "ash/root_window_settings.h"
32 #include "ash/shared/immersive_fullscreen_controller.h" 31 #include "ash/shared/immersive_fullscreen_controller.h"
33 #include "ash/shell.h" 32 #include "ash/shell.h"
34 #include "ash/shell_init_params.h" 33 #include "ash/shell_init_params.h"
34 #include "ash/system/tray/system_tray_delegate.h"
35 #include "ash/wm/window_util.h" 35 #include "ash/wm/window_util.h"
36 #include "base/memory/ptr_util.h" 36 #include "base/memory/ptr_util.h"
37 #include "components/user_manager/user_info_impl.h" 37 #include "components/user_manager/user_info_impl.h"
38 #include "ui/aura/mus/window_tree_client.h" 38 #include "ui/aura/mus/window_tree_client.h"
39 #include "ui/aura/mus/window_tree_host_mus.h" 39 #include "ui/aura/mus/window_tree_host_mus.h"
40 #include "ui/aura/window.h" 40 #include "ui/aura/window.h"
41 #include "ui/display/manager/managed_display_info.h" 41 #include "ui/display/manager/managed_display_info.h"
42 #include "ui/display/screen.h" 42 #include "ui/display/screen.h"
43 #include "ui/views/mus/pointer_watcher_event_router.h" 43 #include "ui/views/mus/pointer_watcher_event_router.h"
44 #include "ui/wm/core/capture_controller.h" 44 #include "ui/wm/core/capture_controller.h"
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 } 422 }
423 423
424 void WmShellMus::CreatePrimaryHost() {} 424 void WmShellMus::CreatePrimaryHost() {}
425 425
426 void WmShellMus::InitHosts(const ShellInitParams& init_params) { 426 void WmShellMus::InitHosts(const ShellInitParams& init_params) {
427 window_manager_->CreatePrimaryRootWindowController( 427 window_manager_->CreatePrimaryRootWindowController(
428 base::WrapUnique(init_params.primary_window_tree_host)); 428 base::WrapUnique(init_params.primary_window_tree_host));
429 } 429 }
430 } // namespace mus 430 } // namespace mus
431 } // namespace ash 431 } // namespace ash
OLDNEW
« no previous file with comments | « ash/metrics/user_metrics_recorder.cc ('k') | ash/mus/network_connect_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698