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

Side by Side Diff: mash/wm/bridge/wm_lookup_mus.cc

Issue 1984293002: Random fixes for mash bridge classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment Created 4 years, 7 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 | « mash/wm/bridge/wm_globals_mus.cc ('k') | mash/wm/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 "mash/wm/bridge/wm_lookup_mus.h" 5 #include "mash/wm/bridge/wm_lookup_mus.h"
6 6
7 #include "mash/wm/bridge/wm_globals_mus.h" 7 #include "mash/wm/bridge/wm_globals_mus.h"
8 #include "mash/wm/bridge/wm_root_window_controller_mus.h" 8 #include "mash/wm/bridge/wm_root_window_controller_mus.h"
9 #include "mash/wm/bridge/wm_window_mus.h" 9 #include "mash/wm/bridge/wm_window_mus.h"
10 #include "ui/views/widget/widget.h" 10 #include "ui/views/widget/widget.h"
11 11
12 namespace mash { 12 namespace mash {
13 namespace wm { 13 namespace wm {
14 14
15 WmLookupMus::WmLookupMus() {} 15 WmLookupMus::WmLookupMus() {
16 WmLookup::Set(this);
17 }
16 18
17 WmLookupMus::~WmLookupMus() {} 19 WmLookupMus::~WmLookupMus() {
20 if (WmLookupMus::Get() == this)
21 WmLookup::Set(nullptr);
22 }
18 23
19 ash::wm::WmRootWindowController* 24 ash::wm::WmRootWindowController*
20 WmLookupMus::GetRootWindowControllerWithDisplayId(int64_t id) { 25 WmLookupMus::GetRootWindowControllerWithDisplayId(int64_t id) {
21 return WmGlobalsMus::Get()->GetRootWindowControllerWithDisplayId(id); 26 return WmGlobalsMus::Get()->GetRootWindowControllerWithDisplayId(id);
22 } 27 }
23 28
24 ash::wm::WmWindow* WmLookupMus::GetWindowForWidget(views::Widget* widget) { 29 ash::wm::WmWindow* WmLookupMus::GetWindowForWidget(views::Widget* widget) {
25 return WmWindowMus::Get(widget); 30 return WmWindowMus::Get(widget);
26 } 31 }
27 32
28 } // namespace wm 33 } // namespace wm
29 } // namespace mash 34 } // namespace mash
OLDNEW
« no previous file with comments | « mash/wm/bridge/wm_globals_mus.cc ('k') | mash/wm/bridge/wm_root_window_controller_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698