summaryrefslogtreecommitdiffstats
path: root/ash/screen_ash.cc
diff options
context:
space:
mode:
authorisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-10 00:34:48 +0000
committerisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-10 00:34:48 +0000
commit49c33c2ddfe099c027bd76a172c65e28f1442bfb (patch)
tree9cf6f597a2273dce5d776d6626ebd7b0b00928ef /ash/screen_ash.cc
parentc9a7428436a7528c76fd03f4bf324197589b3a58 (diff)
downloadchromium_src-49c33c2ddfe099c027bd76a172c65e28f1442bfb.zip
chromium_src-49c33c2ddfe099c027bd76a172c65e28f1442bfb.tar.gz
chromium_src-49c33c2ddfe099c027bd76a172c65e28f1442bfb.tar.bz2
Revert 125950 - Aura/Ash split: Move ScreenAura to aura::RootWindowScreen.
What is now aura::RootWindowScreen was tightly bundled with aura::RootWindow. Instead of moving it to ash::ScreenAsh, I renamed it aurea::RootWindowScreen because there's a bunch of unit tests that use RootWindow as if it were the desktop. Screen integration stuff has been moved out of RootWindow (and related observers) and into ash::Shell. BUG=116458 Review URL: http://codereview.chromium.org/9616045 TBR=erg@chromium.org Review URL: https://chromiumcodereview.appspot.com/9667017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/screen_ash.cc')
-rw-r--r--ash/screen_ash.cc67
1 files changed, 0 insertions, 67 deletions
diff --git a/ash/screen_ash.cc b/ash/screen_ash.cc
deleted file mode 100644
index bbdf9e8..0000000
--- a/ash/screen_ash.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/screen_ash.h"
-
-#include "base/logging.h"
-#include "ui/aura/root_window.h"
-#include "ui/aura/window.h"
-#include "ui/gfx/native_widget_types.h"
-
-namespace ash {
-
-ScreenAsh::ScreenAsh(aura::RootWindow* root_window)
- : root_window_(root_window) {
-}
-
-ScreenAsh::~ScreenAsh() {
-}
-
-gfx::Point ScreenAsh::GetCursorScreenPointImpl() {
- return root_window_->last_mouse_location();
-}
-
-gfx::Rect ScreenAsh::GetMonitorWorkAreaNearestWindowImpl(
- gfx::NativeWindow window) {
- return GetWorkAreaBounds();
-}
-
-gfx::Rect ScreenAsh::GetMonitorAreaNearestWindowImpl(
- gfx::NativeWindow window) {
- return GetBounds();
-}
-
-gfx::Rect ScreenAsh::GetMonitorWorkAreaNearestPointImpl(
- const gfx::Point& point) {
- return GetWorkAreaBounds();
-}
-
-gfx::Rect ScreenAsh::GetMonitorAreaNearestPointImpl(const gfx::Point& point) {
- return GetBounds();
-}
-
-gfx::NativeWindow ScreenAsh::GetWindowAtCursorScreenPointImpl() {
- const gfx::Point point = GetCursorScreenPoint();
- return root_window_->GetTopWindowContainingPoint(point);
-}
-
-gfx::Rect ScreenAsh::GetBounds() {
- return gfx::Rect(root_window_->bounds().size());
-}
-
-gfx::Rect ScreenAsh::GetWorkAreaBounds() {
- gfx::Rect bounds(GetBounds());
- bounds.Inset(work_area_insets_);
- return bounds;
-}
-
-gfx::Size ScreenAsh::GetPrimaryMonitorSizeImpl() {
- return GetMonitorWorkAreaNearestPoint(gfx::Point()).size();
-}
-
-int ScreenAsh::GetNumMonitorsImpl() {
- return 1;
-}
-
-} // namespace ash