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

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

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

Powered by Google App Engine
This is Rietveld 408576698