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

Side by Side Diff: ash/wm/coordinate_conversion.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « ash/wm/coordinate_conversion.h ('k') | ash/wm/dock/docked_window_layout_manager.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/coordinate_conversion.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ui/aura/client/screen_position_client.h" 9 #include "ui/aura/client/screen_position_client.h"
10 #include "ui/aura/root_window.h"
11 #include "ui/gfx/display.h" 10 #include "ui/gfx/display.h"
12 #include "ui/gfx/point.h" 11 #include "ui/gfx/point.h"
13 #include "ui/gfx/rect.h" 12 #include "ui/gfx/rect.h"
14 #include "ui/gfx/screen.h" 13 #include "ui/gfx/screen.h"
15 14
16 namespace ash { 15 namespace ash {
17 namespace wm { 16 namespace wm {
18 17
19 aura::RootWindow* GetRootWindowAt(const gfx::Point& point) { 18 aura::Window* GetRootWindowAt(const gfx::Point& point) {
20 const gfx::Display& display = 19 const gfx::Display& display =
21 Shell::GetScreen()->GetDisplayNearestPoint(point); 20 Shell::GetScreen()->GetDisplayNearestPoint(point);
22 DCHECK(display.is_valid()); 21 DCHECK(display.is_valid());
23 // TODO(yusukes): Move coordinate_conversion.cc and .h to ui/aura/ once 22 // TODO(yusukes): Move coordinate_conversion.cc and .h to ui/aura/ once
24 // GetRootWindowForDisplayId() is moved to aura::Env. 23 // GetRootWindowForDisplayId() is moved to aura::Env.
25 return Shell::GetInstance()->display_controller()-> 24 return Shell::GetInstance()->display_controller()->
26 GetRootWindowForDisplayId(display.id()); 25 GetRootWindowForDisplayId(display.id());
27 } 26 }
28 27
29 aura::RootWindow* GetRootWindowMatching(const gfx::Rect& rect) { 28 aura::Window* GetRootWindowMatching(const gfx::Rect& rect) {
30 const gfx::Display& display = Shell::GetScreen()->GetDisplayMatching(rect); 29 const gfx::Display& display = Shell::GetScreen()->GetDisplayMatching(rect);
31 return Shell::GetInstance()->display_controller()-> 30 return Shell::GetInstance()->display_controller()->
32 GetRootWindowForDisplayId(display.id()); 31 GetRootWindowForDisplayId(display.id());
33 } 32 }
34 33
35 void ConvertPointToScreen(aura::Window* window, gfx::Point* point) { 34 void ConvertPointToScreen(aura::Window* window, gfx::Point* point) {
36 aura::client::GetScreenPositionClient(window->GetRootWindow())-> 35 aura::client::GetScreenPositionClient(window->GetRootWindow())->
37 ConvertPointToScreen(window, point); 36 ConvertPointToScreen(window, point);
38 } 37 }
39 38
40 void ConvertPointFromScreen(aura::Window* window, 39 void ConvertPointFromScreen(aura::Window* window,
41 gfx::Point* point_in_screen) { 40 gfx::Point* point_in_screen) {
42 aura::client::GetScreenPositionClient(window->GetRootWindow())-> 41 aura::client::GetScreenPositionClient(window->GetRootWindow())->
43 ConvertPointFromScreen(window, point_in_screen); 42 ConvertPointFromScreen(window, point_in_screen);
44 } 43 }
45 44
46 } // namespace wm 45 } // namespace wm
47 } // namespace ash 46 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/coordinate_conversion.h ('k') | ash/wm/dock/docked_window_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698