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

Side by Side Diff: ash/wm/common/root_window_finder.cc

Issue 1898223002: Removes most aura dependencies from WindowResizer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_aura_from_window_state
Patch Set: nit and merge Created 4 years, 8 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/wm/common/root_window_finder.h ('k') | ash/wm/common/wm_globals.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/wm/coordinate_conversion.h" 5 #include "ash/wm/common/root_window_finder.h"
6 6
7 #include "ash/display/window_tree_host_manager.h" 7 #include "ash/display/window_tree_host_manager.h"
8 #include "ash/shell.h" 8 #include "ash/wm/common/wm_root_window_controller.h"
9 #include "ui/aura/client/screen_position_client.h" 9 #include "ash/wm/common/wm_window.h"
10 #include "ui/gfx/display.h" 10 #include "ui/gfx/display.h"
11 #include "ui/gfx/geometry/point.h" 11 #include "ui/gfx/geometry/point.h"
12 #include "ui/gfx/geometry/rect.h" 12 #include "ui/gfx/geometry/rect.h"
13 #include "ui/gfx/screen.h" 13 #include "ui/gfx/screen.h"
14 14
15 namespace ash { 15 namespace ash {
16 namespace wm { 16 namespace wm {
17 17
18 aura::Window* GetRootWindowAt(const gfx::Point& point) { 18 WmWindow* GetRootWindowAt(const gfx::Point& point) {
19 const gfx::Display& display = 19 const gfx::Display& display =
20 gfx::Screen::GetScreen()->GetDisplayNearestPoint(point); 20 gfx::Screen::GetScreen()->GetDisplayNearestPoint(point);
21 DCHECK(display.is_valid()); 21 DCHECK(display.is_valid());
22 // TODO(yusukes): Move coordinate_conversion.cc and .h to ui/aura/ once 22 WmRootWindowController* root_window_controller =
23 // GetRootWindowForDisplayId() is moved to aura::Env. 23 WmRootWindowController::GetWithDisplayId(display.id());
24 return Shell::GetInstance() 24 return root_window_controller ? root_window_controller->GetWindow() : nullptr;
25 ->window_tree_host_manager()
26 ->GetRootWindowForDisplayId(display.id());
27 } 25 }
28 26
29 aura::Window* GetRootWindowMatching(const gfx::Rect& rect) { 27 WmWindow* GetRootWindowMatching(const gfx::Rect& rect) {
30 const gfx::Display& display = 28 const gfx::Display& display =
31 gfx::Screen::GetScreen()->GetDisplayMatching(rect); 29 gfx::Screen::GetScreen()->GetDisplayMatching(rect);
32 return Shell::GetInstance() 30 WmRootWindowController* root_window_controller =
33 ->window_tree_host_manager() 31 WmRootWindowController::GetWithDisplayId(display.id());
34 ->GetRootWindowForDisplayId(display.id()); 32 return root_window_controller ? root_window_controller->GetWindow() : nullptr;
35 } 33 }
36 34
37 } // namespace wm 35 } // namespace wm
38 } // namespace ash 36 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/common/root_window_finder.h ('k') | ash/wm/common/wm_globals.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698