diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 14:43:01 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 14:43:01 +0000 |
| commit | 7da9c4cf0e9f949dd1f2a3322118344c5d7369c7 (patch) | |
| tree | ec91a8b4f8a211bc557a9bb28b61c17f90749d02 /chrome/browser/ui/panels/display_settings_provider.cc | |
| parent | c5ba8a93317a8363bcaf4b17cab96a296782803c (diff) | |
| download | chromium_src-7da9c4cf0e9f949dd1f2a3322118344c5d7369c7.zip chromium_src-7da9c4cf0e9f949dd1f2a3322118344c5d7369c7.tar.gz chromium_src-7da9c4cf0e9f949dd1f2a3322118344c5d7369c7.tar.bz2 | |
Rename gfx::Monitor to gfx::Display
BUG=130828
R=oshima@chromium.org
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10540091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141659 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.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/ui/panels/display_settings_provider.cc b/chrome/browser/ui/panels/display_settings_provider.cc index 13ed0ad..32b3955 100644 --- a/chrome/browser/ui/panels/display_settings_provider.cc +++ b/chrome/browser/ui/panels/display_settings_provider.cc @@ -78,15 +78,15 @@ 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::Monitor monitor = gfx::Screen::GetPrimaryMonitor(); - gfx::Rect monitor_area = monitor.bounds(); - gfx::Rect work_area = monitor.work_area(); - int system_menu_height = work_area.y() - monitor_area.y(); + gfx::Display display = gfx::Screen::GetPrimaryMonitor(); + gfx::Rect display_area = display.bounds(); + gfx::Rect work_area = display.work_area(); + int system_menu_height = work_area.y() - display_area.y(); if (system_menu_height > 0) { - monitor_area.set_y(monitor_area.y() + system_menu_height); - monitor_area.set_height(monitor_area.height() - system_menu_height); + display_area.set_y(display_area.y() + system_menu_height); + display_area.set_height(display_area.height() - system_menu_height); } - return monitor_area; + return display_area; #else gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().work_area(); #endif |