From 42c0a0c6d7f217aa7b52a4f3452f74857d894229 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Sun, 17 Jun 2012 03:50:33 +0000 Subject: 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 --- chrome/browser/ui/panels/display_settings_provider.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/browser/ui/panels/display_settings_provider.cc') diff --git a/chrome/browser/ui/panels/display_settings_provider.cc b/chrome/browser/ui/panels/display_settings_provider.cc index 32b3955..d27ed9d 100644 --- a/chrome/browser/ui/panels/display_settings_provider.cc +++ b/chrome/browser/ui/panels/display_settings_provider.cc @@ -69,7 +69,7 @@ gfx::Rect DisplaySettingsProvider::GetDisplayArea() { } gfx::Rect DisplaySettingsProvider::GetPrimaryScreenArea() const { - return gfx::Screen::GetPrimaryMonitor().bounds(); + return gfx::Screen::GetPrimaryDisplay().bounds(); } gfx::Rect DisplaySettingsProvider::GetWorkArea() const { @@ -78,7 +78,7 @@ gfx::Rect DisplaySettingsProvider::GetWorkArea() const { // screen (and overlap Dock). And we also want to exclude the system menu // area. Note that the rect returned from gfx::Screen util functions is in // platform-independent screen coordinates with (0, 0) as the top-left corner. - gfx::Display display = gfx::Screen::GetPrimaryMonitor(); + gfx::Display display = gfx::Screen::GetPrimaryDisplay(); gfx::Rect display_area = display.bounds(); gfx::Rect work_area = display.work_area(); int system_menu_height = work_area.y() - display_area.y(); @@ -88,7 +88,7 @@ gfx::Rect DisplaySettingsProvider::GetWorkArea() const { } return display_area; #else - gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().work_area(); + gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay().work_area(); #endif return work_area; } -- cgit v1.1