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

Unified Diff: ash/screensaver/screensaver_view.cc

Issue 10540123: Rename gfx::Screen::GetMonitorXXXX to gfx::Screen::GetDisplayXXX. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/screen_ash.cc ('k') | ash/system/tray/tray_bubble_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/screensaver/screensaver_view.cc
diff --git a/ash/screensaver/screensaver_view.cc b/ash/screensaver/screensaver_view.cc
index 39eb8fb141a6423fbcddbd17260893afd21d2bff..013024aad8aa9195c0901528feb35ab24c0c582d 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.
« no previous file with comments | « ash/screen_ash.cc ('k') | ash/system/tray/tray_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698