diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-09 17:26:19 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-09 17:26:19 +0000 |
| commit | f1ddc1da13daa47d4513ead413cd167faadd4c71 (patch) | |
| tree | 15b5e919b8b43a92f38adbf6ba2bdd296327a3ef /ui/gfx/screen_aura.cc | |
| parent | 7e2d6e1cdbc0f6c05c5db1262f9d2a8d2eec1edb (diff) | |
| download | chromium_src-f1ddc1da13daa47d4513ead413cd167faadd4c71.zip chromium_src-f1ddc1da13daa47d4513ead413cd167faadd4c71.tar.gz chromium_src-f1ddc1da13daa47d4513ead413cd167faadd4c71.tar.bz2 | |
Cleanup:
- added GetRootWindowForDisplay
- Hookup GetDisplayMatching to DisplayManager
- Fixed comments
- Moved the display code from Shell to MultiDisplayManager
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10697071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145690 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/screen_aura.cc')
| -rw-r--r-- | ui/gfx/screen_aura.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ui/gfx/screen_aura.cc b/ui/gfx/screen_aura.cc index 851b976..befdeaf 100644 --- a/ui/gfx/screen_aura.cc +++ b/ui/gfx/screen_aura.cc @@ -23,9 +23,6 @@ void Screen::SetInstance(ScreenImpl* screen) { g_instance_ = screen; } -// TODO(oshima): Implement ScreenImpl for Linux/aura and remove this -// ifdef. - // static bool Screen::IsDIPEnabled() { return true; @@ -57,13 +54,13 @@ Display Screen::GetDisplayNearestPoint(const Point& point) { } // static -Display Screen::GetPrimaryDisplay() { - return g_instance_->GetPrimaryDisplay(); +Display Screen::GetDisplayMatching(const gfx::Rect& match_rect) { + return g_instance_->GetDisplayMatching(match_rect); } // static -Display Screen::GetDisplayMatching(const gfx::Rect& match_rect) { - return g_instance_->GetDisplayNearestPoint(match_rect.CenterPoint()); +Display Screen::GetPrimaryDisplay() { + return g_instance_->GetPrimaryDisplay(); } } // namespace gfx |