| 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/aura/wm_lookup_aura.h" |   5 #include "ash/aura/wm_lookup_aura.h" | 
|   6  |   6  | 
|   7 #include "ash/aura/wm_window_aura.h" |  | 
|   8 #include "ash/common/wm_layout_manager.h" |   7 #include "ash/common/wm_layout_manager.h" | 
 |   8 #include "ash/common/wm_window.h" | 
|   9 #include "ash/display/window_tree_host_manager.h" |   9 #include "ash/display/window_tree_host_manager.h" | 
|  10 #include "ash/root_window_controller.h" |  10 #include "ash/root_window_controller.h" | 
|  11 #include "ash/shell.h" |  11 #include "ash/shell.h" | 
|  12 #include "ui/views/widget/widget.h" |  12 #include "ui/views/widget/widget.h" | 
|  13  |  13  | 
|  14 namespace ash { |  14 namespace ash { | 
|  15  |  15  | 
|  16 WmLookupAura::WmLookupAura() { |  16 WmLookupAura::WmLookupAura() { | 
|  17   WmLookup::Set(this); |  17   WmLookup::Set(this); | 
|  18 } |  18 } | 
|  19  |  19  | 
|  20 WmLookupAura::~WmLookupAura() { |  20 WmLookupAura::~WmLookupAura() { | 
|  21   WmLookup::Set(nullptr); |  21   WmLookup::Set(nullptr); | 
|  22 } |  22 } | 
|  23  |  23  | 
|  24 RootWindowController* WmLookupAura::GetRootWindowControllerWithDisplayId( |  24 RootWindowController* WmLookupAura::GetRootWindowControllerWithDisplayId( | 
|  25     int64_t id) { |  25     int64_t id) { | 
|  26   aura::Window* root_window = Shell::GetInstance() |  26   aura::Window* root_window = Shell::GetInstance() | 
|  27                                   ->window_tree_host_manager() |  27                                   ->window_tree_host_manager() | 
|  28                                   ->GetRootWindowForDisplayId(id); |  28                                   ->GetRootWindowForDisplayId(id); | 
|  29   return root_window ? RootWindowController::ForWindow(root_window) : nullptr; |  29   return root_window ? RootWindowController::ForWindow(root_window) : nullptr; | 
|  30 } |  30 } | 
|  31  |  31  | 
|  32 WmWindow* WmLookupAura::GetWindowForWidget(views::Widget* widget) { |  32 WmWindow* WmLookupAura::GetWindowForWidget(views::Widget* widget) { | 
|  33   return WmWindowAura::Get(widget->GetNativeWindow()); |  33   return WmWindow::Get(widget->GetNativeWindow()); | 
|  34 } |  34 } | 
|  35  |  35  | 
|  36 }  // namespace ash |  36 }  // namespace ash | 
| OLD | NEW |