OLD | NEW |
---|---|
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 "mash/wm/bridge/wm_globals_mus.h" | 5 #include "mash/wm/bridge/wm_globals_mus.h" |
6 | 6 |
7 #include "ash/public/interfaces/container.mojom.h" | |
msw
2016/06/01 01:51:42
q: I wonder if this is actually needed...
sky
2016/06/01 03:30:26
You are right. Removed.
| |
7 #include "ash/wm/common/window_resizer.h" | 8 #include "ash/wm/common/window_resizer.h" |
8 #include "ash/wm/common/wm_activation_observer.h" | 9 #include "ash/wm/common/wm_activation_observer.h" |
9 #include "ash/wm/common/wm_shell_window_ids.h" | 10 #include "ash/wm/common/wm_shell_window_ids.h" |
10 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
11 #include "components/mus/common/util.h" | 12 #include "components/mus/common/util.h" |
12 #include "components/mus/public/cpp/window.h" | 13 #include "components/mus/public/cpp/window.h" |
13 #include "components/mus/public/cpp/window_tree_client.h" | 14 #include "components/mus/public/cpp/window_tree_client.h" |
14 #include "mash/wm/bridge/wm_root_window_controller_mus.h" | 15 #include "mash/wm/bridge/wm_root_window_controller_mus.h" |
15 #include "mash/wm/bridge/wm_window_mus.h" | 16 #include "mash/wm/bridge/wm_window_mus.h" |
16 #include "mash/wm/container_ids.h" | 17 #include "mash/wm/container_ids.h" |
17 #include "mash/wm/drag_window_resizer.h" | 18 #include "mash/wm/drag_window_resizer.h" |
18 #include "mash/wm/public/interfaces/container.mojom.h" | |
19 #include "mash/wm/root_window_controller.h" | 19 #include "mash/wm/root_window_controller.h" |
20 | 20 |
21 namespace mash { | 21 namespace mash { |
22 namespace wm { | 22 namespace wm { |
23 | 23 |
24 WmGlobalsMus::WmGlobalsMus(mus::WindowTreeClient* client) | 24 WmGlobalsMus::WmGlobalsMus(mus::WindowTreeClient* client) |
25 : client_(client) { | 25 : client_(client) { |
26 client_->AddObserver(this); | 26 client_->AddObserver(this); |
27 WmGlobals::Set(this); | 27 WmGlobals::Set(this); |
28 } | 28 } |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
219 } | 219 } |
220 | 220 |
221 void WmGlobalsMus::OnWillDestroyClient( | 221 void WmGlobalsMus::OnWillDestroyClient( |
222 mus::WindowTreeClient* client) { | 222 mus::WindowTreeClient* client) { |
223 DCHECK_EQ(client, client_); | 223 DCHECK_EQ(client, client_); |
224 RemoveClientObserver(); | 224 RemoveClientObserver(); |
225 } | 225 } |
226 | 226 |
227 } // namespace wm | 227 } // namespace wm |
228 } // namespace mash | 228 } // namespace mash |
OLD | NEW |