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

Side by Side Diff: components/exo/wm_helper_ash.cc

Issue 2445583002: Relocate display_manager from ash to ui (Closed)
Patch Set: fix windows build Created 4 years, 1 month 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 | « components/exo/pointer.cc ('k') | ui/display/BUILD.gn » ('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 "components/exo/wm_helper_ash.h" 5 #include "components/exo/wm_helper_ash.h"
6 6
7 #include "ash/common/accessibility_delegate.h" 7 #include "ash/common/accessibility_delegate.h"
8 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" 8 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
9 #include "ash/common/wm_shell.h" 9 #include "ash/common/wm_shell.h"
10 #include "ash/display/display_manager.h"
11 #include "ash/shell.h" 10 #include "ash/shell.h"
12 #include "base/memory/singleton.h" 11 #include "base/memory/singleton.h"
13 #include "ui/aura/client/focus_client.h" 12 #include "ui/aura/client/focus_client.h"
13 #include "ui/display/manager/display_manager.h"
14 #include "ui/wm/public/activation_client.h" 14 #include "ui/wm/public/activation_client.h"
15 15
16 namespace exo { 16 namespace exo {
17 17
18 //////////////////////////////////////////////////////////////////////////////// 18 ////////////////////////////////////////////////////////////////////////////////
19 // WMHelperAsh, public: 19 // WMHelperAsh, public:
20 20
21 WMHelperAsh::WMHelperAsh() { 21 WMHelperAsh::WMHelperAsh() {
22 ash::WmShell::Get()->AddShellObserver(this); 22 ash::WmShell::Get()->AddShellObserver(this);
23 ash::Shell::GetInstance()->activation_client()->AddObserver(this); 23 ash::Shell::GetInstance()->activation_client()->AddObserver(this);
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 127
128 void WMHelperAsh::OnMaximizeModeStarted() { 128 void WMHelperAsh::OnMaximizeModeStarted() {
129 NotifyMaximizeModeStarted(); 129 NotifyMaximizeModeStarted();
130 } 130 }
131 131
132 void WMHelperAsh::OnMaximizeModeEnded() { 132 void WMHelperAsh::OnMaximizeModeEnded() {
133 NotifyMaximizeModeEnded(); 133 NotifyMaximizeModeEnded();
134 } 134 }
135 135
136 } // namespace exo 136 } // namespace exo
OLDNEW
« no previous file with comments | « components/exo/pointer.cc ('k') | ui/display/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698