summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/panels/display_settings_provider.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-17 03:50:33 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-17 03:50:33 +0000
commit42c0a0c6d7f217aa7b52a4f3452f74857d894229 (patch)
treeac51dd0c4ee2e4cf8b3425ede7a78cb5a8da257c /chrome/browser/ui/panels/display_settings_provider.cc
parent0e62ba1500c67c29943d8ff3ea48d07599396e92 (diff)
downloadchromium_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 'chrome/browser/ui/panels/display_settings_provider.cc')
-rw-r--r--chrome/browser/ui/panels/display_settings_provider.cc6
1 files changed, 3 insertions, 3 deletions
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;
}