summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/window_sizer_unittest.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-08 02:01:40 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-08 02:01:40 +0000
commit8581ac3868091773691cd2c9798ed6f905614368 (patch)
tree14fb383b7f5c7b6560c9c8836db63dc83e01c798 /chrome/browser/ui/window_sizer_unittest.cc
parenta62479b9b7ab4979454eb0bef7e29120f8e9f209 (diff)
downloadchromium_src-8581ac3868091773691cd2c9798ed6f905614368.zip
chromium_src-8581ac3868091773691cd2c9798ed6f905614368.tar.gz
chromium_src-8581ac3868091773691cd2c9798ed6f905614368.tar.bz2
Extract MonitorInfoProvider from WindowSizer.
And move the functionality into gfx::Screen. BUG=101507 R=ben@chromium.org Review URL: http://codereview.chromium.org/8549008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/window_sizer_unittest.cc')
-rw-r--r--chrome/browser/ui/window_sizer_unittest.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/ui/window_sizer_unittest.cc b/chrome/browser/ui/window_sizer_unittest.cc
index ab94b40..2beb4d8 100644
--- a/chrome/browser/ui/window_sizer_unittest.cc
+++ b/chrome/browser/ui/window_sizer_unittest.cc
@@ -43,7 +43,7 @@ static int kWindowTilePixels = WindowSizer::kWindowTilePixels;
// Testing implementation of WindowSizer::MonitorInfoProvider that we can use
// to fake various monitor layouts and sizes.
-class TestMonitorInfoProvider : public WindowSizer::MonitorInfoProvider {
+class TestMonitorInfoProvider : public MonitorInfoProvider {
public:
TestMonitorInfoProvider() {}
virtual ~TestMonitorInfoProvider() {}
@@ -68,8 +68,6 @@ class TestMonitorInfoProvider : public WindowSizer::MonitorInfoProvider {
return work_areas_[GetMonitorIndexMatchingBounds(match_rect)];
}
- virtual void UpdateWorkAreas() OVERRIDE {}
-
private:
size_t GetMonitorIndexMatchingBounds(const gfx::Rect& match_rect) const {
int max_area = 0;
@@ -88,6 +86,7 @@ class TestMonitorInfoProvider : public WindowSizer::MonitorInfoProvider {
}
std::vector<gfx::Rect> monitor_bounds_;
+ std::vector<gfx::Rect> work_areas_;
DISALLOW_COPY_AND_ASSIGN(TestMonitorInfoProvider);
};