diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-17 03:50:33 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-17 03:50:33 +0000 |
| commit | 42c0a0c6d7f217aa7b52a4f3452f74857d894229 (patch) | |
| tree | ac51dd0c4ee2e4cf8b3425ede7a78cb5a8da257c /ash/screensaver | |
| parent | 0e62ba1500c67c29943d8ff3ea48d07599396e92 (diff) | |
| download | chromium_src-42c0a0c6d7f217aa7b52a4f3452f74857d894229.zip chromium_src-42c0a0c6d7f217aa7b52a4f3452f74857d894229.tar.gz chromium_src-42c0a0c6d7f217aa7b52a4f3452f74857d894229.tar.bz2 | |
Rename gfx::Screen::GetMonitorXXXX to gfx::Screen::GetDisplayXXX.
BUG=130828
R=oshima@chromium.org
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10540123
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142631 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/screensaver')
| -rw-r--r-- | ash/screensaver/screensaver_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/screensaver/screensaver_view.cc b/ash/screensaver/screensaver_view.cc index 39eb8fb..013024a 100644 --- a/ash/screensaver/screensaver_view.cc +++ b/ash/screensaver/screensaver_view.cc @@ -10,10 +10,10 @@ #include "base/logging.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" -#include "ui/gfx/screen.h" #include "ui/aura/root_window.h" -#include "ui/views/layout/fill_layout.h" +#include "ui/gfx/screen.h" #include "ui/views/controls/webview/webview.h" +#include "ui/views/layout/fill_layout.h" #include "ui/views/widget/widget.h" using content::BrowserThread; @@ -129,7 +129,7 @@ void ScreensaverView::LoadScreensaver() { void ScreensaverView::ShowWindow() { aura::RootWindow* root_window = ash::Shell::GetPrimaryRootWindow(); gfx::Rect screen_rect = - gfx::Screen::GetMonitorNearestWindow(root_window).bounds(); + gfx::Screen::GetDisplayNearestWindow(root_window).bounds(); // We want to be the fullscreen topmost child of the root window. // There should be nothing ever really that should show up on top of us. |