summaryrefslogtreecommitdiffstats
path: root/ash/screen_ash.h
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 /ash/screen_ash.h
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 'ash/screen_ash.h')
-rw-r--r--ash/screen_ash.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/screen_ash.h b/ash/screen_ash.h
index bfe29b3..bd987d3 100644
--- a/ash/screen_ash.h
+++ b/ash/screen_ash.h
@@ -32,12 +32,12 @@ class ASH_EXPORT ScreenAsh : public gfx::ScreenImpl {
virtual gfx::Point GetCursorScreenPoint() OVERRIDE;
virtual gfx::NativeWindow GetWindowAtCursorScreenPoint() OVERRIDE;
- virtual int GetNumMonitors() OVERRIDE;
- virtual gfx::Display GetMonitorNearestWindow(
+ virtual int GetNumDisplays() OVERRIDE;
+ virtual gfx::Display GetDisplayNearestWindow(
gfx::NativeView view) const OVERRIDE;
- virtual gfx::Display GetMonitorNearestPoint(
+ virtual gfx::Display GetDisplayNearestPoint(
const gfx::Point& point) const OVERRIDE;
- virtual gfx::Display GetPrimaryMonitor() const OVERRIDE;
+ virtual gfx::Display GetPrimaryDisplay() const OVERRIDE;
private:
DISALLOW_COPY_AND_ASSIGN(ScreenAsh);