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

Unified Diff: chrome/browser/ui/window_sizer.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 | « chrome/browser/ui/window_sizer.h ('k') | chrome/browser/ui/window_sizer_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/window_sizer.cc
diff --git a/chrome/browser/ui/window_sizer.cc b/chrome/browser/ui/window_sizer.cc
index 0dffea6ee77cacd95dbd24f5cdc1f896bb385051..13a1505c0a4e16bf9dc1a83b9343c62a70a6b839 100644
--- a/chrome/browser/ui/window_sizer.cc
+++ b/chrome/browser/ui/window_sizer.cc
@@ -22,15 +22,15 @@ const int kMinVisibleWidth = 30;
class DefaultMonitorInfoProvider : public MonitorInfoProvider {
public:
// Overridden from MonitorInfoProvider:
- virtual gfx::Rect GetPrimaryMonitorWorkArea() const OVERRIDE {
- return gfx::Screen::GetPrimaryMonitor().work_area();
+ virtual gfx::Rect GetPrimaryDisplayWorkArea() const OVERRIDE {
+ return gfx::Screen::GetPrimaryDisplay().work_area();
}
- virtual gfx::Rect GetPrimaryMonitorBounds() const OVERRIDE {
- return gfx::Screen::GetPrimaryMonitor().bounds();
+ virtual gfx::Rect GetPrimaryDisplayBounds() const OVERRIDE {
+ return gfx::Screen::GetPrimaryDisplay().bounds();
}
virtual gfx::Rect GetMonitorWorkAreaMatching(
const gfx::Rect& match_rect) const OVERRIDE {
- return gfx::Screen::GetMonitorMatching(match_rect).work_area();
+ return gfx::Screen::GetDisplayMatching(match_rect).work_area();
}
};
@@ -213,7 +213,7 @@ void WindowSizer::GetDefaultWindowBounds(gfx::Rect* default_bounds) const {
DCHECK(default_bounds);
DCHECK(monitor_info_provider_.get());
- gfx::Rect work_area = monitor_info_provider_->GetPrimaryMonitorWorkArea();
+ gfx::Rect work_area = monitor_info_provider_->GetPrimaryDisplayWorkArea();
// The default size is either some reasonably wide width, or if the work
// area is narrower, then the work area width less some aesthetic padding.
@@ -222,7 +222,7 @@ void WindowSizer::GetDefaultWindowBounds(gfx::Rect* default_bounds) const {
// For wider aspect ratio displays at higher resolutions, we might size the
// window narrower to allow two windows to easily be placed side-by-side.
- gfx::Rect screen_size = monitor_info_provider_->GetPrimaryMonitorBounds();
+ gfx::Rect screen_size = monitor_info_provider_->GetPrimaryDisplayBounds();
double width_to_height =
static_cast<double>(screen_size.width()) / screen_size.height();
« no previous file with comments | « chrome/browser/ui/window_sizer.h ('k') | chrome/browser/ui/window_sizer_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698