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

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

Issue 2620913003: Removes WmRootWindowController subclasses (Closed)
Patch Set: spelling Created 3 years, 11 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/BUILD.gn ('k') | ash/mus/bridge/wm_root_window_controller_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_lookup_mus.h" 5 #include "ash/mus/bridge/wm_lookup_mus.h"
6 6
7 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
8 #include "ash/mus/bridge/wm_shell_mus.h" 7 #include "ash/mus/bridge/wm_shell_mus.h"
9 #include "ash/mus/bridge/wm_window_mus.h" 8 #include "ash/mus/bridge/wm_window_mus.h"
9 #include "ash/mus/root_window_controller.h"
10 #include "ui/views/widget/widget.h" 10 #include "ui/views/widget/widget.h"
11 11
12 namespace ash { 12 namespace ash {
13 namespace mus { 13 namespace mus {
14 14
15 WmLookupMus::WmLookupMus() { 15 WmLookupMus::WmLookupMus() {
16 WmLookup::Set(this); 16 WmLookup::Set(this);
17 } 17 }
18 18
19 WmLookupMus::~WmLookupMus() { 19 WmLookupMus::~WmLookupMus() {
20 if (WmLookupMus::Get() == this) 20 if (WmLookupMus::Get() == this)
21 WmLookup::Set(nullptr); 21 WmLookup::Set(nullptr);
22 } 22 }
23 23
24 WmRootWindowController* WmLookupMus::GetRootWindowControllerWithDisplayId( 24 WmRootWindowController* WmLookupMus::GetRootWindowControllerWithDisplayId(
25 int64_t id) { 25 int64_t id) {
26 return WmShellMus::Get()->GetRootWindowControllerWithDisplayId(id); 26 return WmShellMus::Get()
27 ->GetRootWindowControllerWithDisplayId(id)
28 ->ash_root_window_controller()
29 ->wm_root_window_controller();
27 } 30 }
28 31
29 WmWindow* WmLookupMus::GetWindowForWidget(views::Widget* widget) { 32 WmWindow* WmLookupMus::GetWindowForWidget(views::Widget* widget) {
30 return WmWindowMus::Get(widget); 33 return WmWindowMus::Get(widget);
31 } 34 }
32 35
33 } // namespace mus 36 } // namespace mus
34 } // namespace ash 37 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/bridge/wm_root_window_controller_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698