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

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

Issue 2119963002: Move mus to //services/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 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/mus/bridge/wm_shell_mus.h ('k') | ash/mus/bridge/wm_window_mus.h » ('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 "ash/common/default_accessibility_delegate.h" 7 #include "ash/common/default_accessibility_delegate.h"
8 #include "ash/common/display/display_info.h" 8 #include "ash/common/display/display_info.h"
9 #include "ash/common/session/session_state_delegate.h" 9 #include "ash/common/session/session_state_delegate.h"
10 #include "ash/common/shell_observer.h" 10 #include "ash/common/shell_observer.h"
11 #include "ash/common/shell_window_ids.h" 11 #include "ash/common/shell_window_ids.h"
12 #include "ash/common/system/tray/default_system_tray_delegate.h" 12 #include "ash/common/system/tray/default_system_tray_delegate.h"
13 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h" 13 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
14 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h" 14 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h"
15 #include "ash/common/wm/mru_window_tracker.h" 15 #include "ash/common/wm/mru_window_tracker.h"
16 #include "ash/common/wm/window_resizer.h" 16 #include "ash/common/wm/window_resizer.h"
17 #include "ash/common/wm_activation_observer.h" 17 #include "ash/common/wm_activation_observer.h"
18 #include "ash/mus/bridge/wm_root_window_controller_mus.h" 18 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
19 #include "ash/mus/bridge/wm_window_mus.h" 19 #include "ash/mus/bridge/wm_window_mus.h"
20 #include "ash/mus/container_ids.h" 20 #include "ash/mus/container_ids.h"
21 #include "ash/mus/drag_window_resizer.h" 21 #include "ash/mus/drag_window_resizer.h"
22 #include "ash/mus/root_window_controller.h" 22 #include "ash/mus/root_window_controller.h"
23 #include "base/memory/ptr_util.h" 23 #include "base/memory/ptr_util.h"
24 #include "components/mus/common/util.h"
25 #include "components/mus/public/cpp/window.h"
26 #include "components/mus/public/cpp/window_tree_client.h"
27 #include "components/user_manager/user_info_impl.h" 24 #include "components/user_manager/user_info_impl.h"
25 #include "services/ui/common/util.h"
26 #include "services/ui/public/cpp/window.h"
27 #include "services/ui/public/cpp/window_tree_client.h"
28 28
29 namespace ash { 29 namespace ash {
30 namespace mus { 30 namespace mus {
31 31
32 namespace { 32 namespace {
33 33
34 // TODO(jamescook): After ShellDelegate is ported to ash/common use 34 // TODO(jamescook): After ShellDelegate is ported to ash/common use
35 // ShellDelegate::CreateSessionStateDelegate() to construct the mus version 35 // ShellDelegate::CreateSessionStateDelegate() to construct the mus version
36 // of SessionStateDelegate. 36 // of SessionStateDelegate.
37 class SessionStateDelegateStub : public SessionStateDelegate { 37 class SessionStateDelegateStub : public SessionStateDelegate {
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 OnWindowActivated(gained_active, lost_active)); 328 OnWindowActivated(gained_active, lost_active));
329 } 329 }
330 330
331 void WmShellMus::OnDidDestroyClient(::mus::WindowTreeClient* client) { 331 void WmShellMus::OnDidDestroyClient(::mus::WindowTreeClient* client) {
332 DCHECK_EQ(client, client_); 332 DCHECK_EQ(client, client_);
333 RemoveClientObserver(); 333 RemoveClientObserver();
334 } 334 }
335 335
336 } // namespace mus 336 } // namespace mus
337 } // namespace ash 337 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/mus/bridge/wm_window_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698