| 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 "ash/mus/bridge/wm_lookup_mus.h" | 5 #include "ash/mus/bridge/wm_lookup_mus.h" |
| 6 | 6 |
| 7 #include "ash/aura/wm_window_aura.h" | 7 #include "ash/common/wm_window.h" |
| 8 #include "ash/mus/bridge/wm_shell_mus.h" | 8 #include "ash/mus/bridge/wm_shell_mus.h" |
| 9 #include "ash/mus/root_window_controller.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 ash::RootWindowController* WmLookupMus::GetRootWindowControllerWithDisplayId( | 24 ash::RootWindowController* WmLookupMus::GetRootWindowControllerWithDisplayId( |
| 25 int64_t id) { | 25 int64_t id) { |
| 26 return WmShellMus::Get() | 26 return WmShellMus::Get() |
| 27 ->GetRootWindowControllerWithDisplayId(id) | 27 ->GetRootWindowControllerWithDisplayId(id) |
| 28 ->ash_root_window_controller(); | 28 ->ash_root_window_controller(); |
| 29 } | 29 } |
| 30 | 30 |
| 31 WmWindow* WmLookupMus::GetWindowForWidget(views::Widget* widget) { | 31 WmWindow* WmLookupMus::GetWindowForWidget(views::Widget* widget) { |
| 32 return ash::WmWindowAura::Get(widget->GetNativeWindow()); | 32 return WmWindow::Get(widget->GetNativeWindow()); |
| 33 } | 33 } |
| 34 | 34 |
| 35 } // namespace mus | 35 } // namespace mus |
| 36 } // namespace ash | 36 } // namespace ash |
| OLD | NEW |