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

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

Issue 1921883002: Removes WindowState::aura_window() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix windows build 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/aura/wm_window_aura.cc ('k') | ash/wm/common/window_state_util.cc » ('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/common/root_window_finder.h" 5 #include "ash/wm/common/root_window_finder.h"
6 6
7 #include "ash/display/window_tree_host_manager.h"
8 #include "ash/wm/common/wm_root_window_controller.h" 7 #include "ash/wm/common/wm_root_window_controller.h"
9 #include "ash/wm/common/wm_window.h" 8 #include "ash/wm/common/wm_window.h"
10 #include "ui/gfx/display.h" 9 #include "ui/gfx/display.h"
11 #include "ui/gfx/geometry/point.h" 10 #include "ui/gfx/geometry/point.h"
12 #include "ui/gfx/geometry/rect.h" 11 #include "ui/gfx/geometry/rect.h"
13 #include "ui/gfx/screen.h" 12 #include "ui/gfx/screen.h"
14 13
15 namespace ash { 14 namespace ash {
16 namespace wm { 15 namespace wm {
17 16
18 WmWindow* GetRootWindowAt(const gfx::Point& point) { 17 WmWindow* GetRootWindowAt(const gfx::Point& point) {
19 const gfx::Display& display = 18 const gfx::Display& display =
20 gfx::Screen::GetScreen()->GetDisplayNearestPoint(point); 19 gfx::Screen::GetScreen()->GetDisplayNearestPoint(point);
21 DCHECK(display.is_valid()); 20 DCHECK(display.is_valid());
22 WmRootWindowController* root_window_controller = 21 WmRootWindowController* root_window_controller =
23 WmRootWindowController::GetWithDisplayId(display.id()); 22 WmRootWindowController::GetWithDisplayId(display.id());
24 return root_window_controller ? root_window_controller->GetWindow() : nullptr; 23 return root_window_controller ? root_window_controller->GetWindow() : nullptr;
25 } 24 }
26 25
27 WmWindow* GetRootWindowMatching(const gfx::Rect& rect) { 26 WmWindow* GetRootWindowMatching(const gfx::Rect& rect) {
28 const gfx::Display& display = 27 const gfx::Display& display =
29 gfx::Screen::GetScreen()->GetDisplayMatching(rect); 28 gfx::Screen::GetScreen()->GetDisplayMatching(rect);
30 WmRootWindowController* root_window_controller = 29 WmRootWindowController* root_window_controller =
31 WmRootWindowController::GetWithDisplayId(display.id()); 30 WmRootWindowController::GetWithDisplayId(display.id());
32 return root_window_controller ? root_window_controller->GetWindow() : nullptr; 31 return root_window_controller ? root_window_controller->GetWindow() : nullptr;
33 } 32 }
34 33
35 } // namespace wm 34 } // namespace wm
36 } // namespace ash 35 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/aura/wm_window_aura.cc ('k') | ash/wm/common/window_state_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698