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

Side by Side Diff: ash/screen_ash.cc

Issue 9616045: Aura/Ash split: Move ScreenAura to ash::ScreenAsh. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use a separate aura::TestScreen in tests instead, partially reverting to patchset 2 Created 8 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
« no previous file with comments | « ash/screen_ash.h ('k') | ash/shell.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 "ui/aura/screen_aura.h" 5 #include "ash/screen_ash.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/aura/root_window.h" 8 #include "ui/aura/root_window.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/gfx/native_widget_types.h" 10 #include "ui/gfx/native_widget_types.h"
11 11
12 namespace aura { 12 namespace ash {
13 13
14 ScreenAura::ScreenAura(RootWindow* root_window) : root_window_(root_window) { 14 ScreenAsh::ScreenAsh(aura::RootWindow* root_window)
15 : root_window_(root_window) {
15 } 16 }
16 17
17 ScreenAura::~ScreenAura() { 18 ScreenAsh::~ScreenAsh() {
18 } 19 }
19 20
20 gfx::Point ScreenAura::GetCursorScreenPointImpl() { 21 gfx::Point ScreenAsh::GetCursorScreenPointImpl() {
21 return root_window_->last_mouse_location(); 22 return root_window_->last_mouse_location();
22 } 23 }
23 24
24 gfx::Rect ScreenAura::GetMonitorWorkAreaNearestWindowImpl( 25 gfx::Rect ScreenAsh::GetMonitorWorkAreaNearestWindowImpl(
25 gfx::NativeWindow window) { 26 gfx::NativeWindow window) {
26 return GetWorkAreaBounds(); 27 return GetWorkAreaBounds();
27 } 28 }
28 29
29 gfx::Rect ScreenAura::GetMonitorAreaNearestWindowImpl( 30 gfx::Rect ScreenAsh::GetMonitorAreaNearestWindowImpl(
30 gfx::NativeWindow window) { 31 gfx::NativeWindow window) {
31 return GetBounds(); 32 return GetBounds();
32 } 33 }
33 34
34 gfx::Rect ScreenAura::GetMonitorWorkAreaNearestPointImpl( 35 gfx::Rect ScreenAsh::GetMonitorWorkAreaNearestPointImpl(
35 const gfx::Point& point) { 36 const gfx::Point& point) {
36 return GetWorkAreaBounds(); 37 return GetWorkAreaBounds();
37 } 38 }
38 39
39 gfx::Rect ScreenAura::GetMonitorAreaNearestPointImpl(const gfx::Point& point) { 40 gfx::Rect ScreenAsh::GetMonitorAreaNearestPointImpl(const gfx::Point& point) {
40 return GetBounds(); 41 return GetBounds();
41 } 42 }
42 43
43 gfx::NativeWindow ScreenAura::GetWindowAtCursorScreenPointImpl() { 44 gfx::NativeWindow ScreenAsh::GetWindowAtCursorScreenPointImpl() {
44 const gfx::Point point = GetCursorScreenPoint(); 45 const gfx::Point point = GetCursorScreenPoint();
45 return root_window_->GetTopWindowContainingPoint(point); 46 return root_window_->GetTopWindowContainingPoint(point);
46 } 47 }
47 48
48 gfx::Rect ScreenAura::GetBounds() { 49 gfx::Rect ScreenAsh::GetBounds() {
49 return gfx::Rect(root_window_->bounds().size()); 50 return gfx::Rect(root_window_->bounds().size());
50 } 51 }
51 52
52 gfx::Rect ScreenAura::GetWorkAreaBounds() { 53 gfx::Rect ScreenAsh::GetWorkAreaBounds() {
53 gfx::Rect bounds(GetBounds()); 54 gfx::Rect bounds(GetBounds());
54 bounds.Inset(work_area_insets_); 55 bounds.Inset(work_area_insets_);
55 return bounds; 56 return bounds;
56 } 57 }
57 58
58 gfx::Size ScreenAura::GetPrimaryMonitorSizeImpl() { 59 gfx::Size ScreenAsh::GetPrimaryMonitorSizeImpl() {
59 return GetMonitorWorkAreaNearestPoint(gfx::Point()).size(); 60 return GetMonitorWorkAreaNearestPoint(gfx::Point()).size();
60 } 61 }
61 62
62 int ScreenAura::GetNumMonitorsImpl() { 63 int ScreenAsh::GetNumMonitorsImpl() {
63 return 1; 64 return 1;
64 } 65 }
65 66
66 } // namespace aura 67 } // namespace ash
OLDNEW
« no previous file with comments | « ash/screen_ash.h ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698