diff options
author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 21:09:17 +0000 |
---|---|---|
committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 21:09:17 +0000 |
commit | 1a2145b860591d2e868ab98147ea4f162636d7eb (patch) | |
tree | 26a65524e4698ffc4b76eeb3409bbd0fca2ae238 /ui/gfx/screen_aura.cc | |
parent | 73238e09cc56e8b1b599ec978bec7bdd7a7730a8 (diff) | |
download | chromium_src-1a2145b860591d2e868ab98147ea4f162636d7eb.zip chromium_src-1a2145b860591d2e868ab98147ea4f162636d7eb.tar.gz chromium_src-1a2145b860591d2e868ab98147ea4f162636d7eb.tar.bz2 |
Recommit r125950, which was reverted by r125958 due to link failures on win_aura bot.
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
First Review URL: http://codereview.chromium.org/9616045
Review URL: http://codereview.chromium.org/9696008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/screen_aura.cc')
-rw-r--r-- | ui/gfx/screen_aura.cc | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/ui/gfx/screen_aura.cc b/ui/gfx/screen_aura.cc deleted file mode 100644 index ea4216f..0000000 --- a/ui/gfx/screen_aura.cc +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) 2011 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 "ui/gfx/screen.h" - -#include "base/logging.h" -#include "ui/gfx/native_widget_types.h" - -namespace gfx { - -// gfx can't depend upon aura, otherwise we have circular dependencies. So, -// gfx::Screen is pluggable for aura and Desktop plugs in the real -// implementation. - -// static -Screen* Screen::instance_ = NULL; - -// static -void Screen::SetInstance(Screen* screen) { - delete instance_; - instance_ = screen; -} - -// static -gfx::Point Screen::GetCursorScreenPoint() { - return instance_->GetCursorScreenPointImpl(); -} - -// static -gfx::Rect Screen::GetMonitorWorkAreaNearestWindow(gfx::NativeWindow window) { - return instance_->GetMonitorWorkAreaNearestWindowImpl(window); -} - -// static -gfx::Rect Screen::GetMonitorAreaNearestWindow(gfx::NativeWindow window) { - return instance_->GetMonitorAreaNearestWindowImpl(window); -} - -// static -gfx::Rect Screen::GetMonitorWorkAreaNearestPoint(const gfx::Point& point) { - return instance_->GetMonitorWorkAreaNearestPointImpl(point); -} - -// static -gfx::Rect Screen::GetMonitorAreaNearestPoint(const gfx::Point& point) { - return instance_->GetMonitorAreaNearestPointImpl(point); -} - -// static -gfx::Rect Screen::GetPrimaryMonitorWorkArea() { - return instance_->GetMonitorWorkAreaNearestPoint(gfx::Point()); -} - -// static -gfx::Rect Screen::GetPrimaryMonitorBounds() { - return instance_->GetMonitorAreaNearestPoint(gfx::Point()); -} - -// static -gfx::Rect Screen::GetMonitorWorkAreaMatching(const gfx::Rect& match_rect) { - return instance_->GetMonitorWorkAreaNearestPoint(gfx::Point()); -} - -// static -gfx::NativeWindow Screen::GetWindowAtCursorScreenPoint() { - return instance_->GetWindowAtCursorScreenPointImpl(); -} - -// static -gfx::Size Screen::GetPrimaryMonitorSize() { - return instance_->GetPrimaryMonitorSizeImpl(); -} - -// static -int Screen::GetNumMonitors() { - return instance_->GetNumMonitorsImpl(); -} - -} // namespace gfx |