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

Side by Side Diff: trunk/src/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc

Issue 14651015: Revert 198977 "Remove unused third_party/WebKit #includes from c..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/window_sizer/window_sizer_common_unittest.h" 5 #include "chrome/browser/ui/window_sizer/window_sizer_common_unittest.h"
6 6
7 #include "ash/wm/window_resizer.h" 7 #include "ash/wm/window_resizer.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
11 #include "chrome/test/base/testing_profile.h" 11 #include "chrome/test/base/testing_profile.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
13 14
14 TestMonitorInfoProvider::TestMonitorInfoProvider() {}; 15 TestMonitorInfoProvider::TestMonitorInfoProvider() {};
15 16
16 TestMonitorInfoProvider::~TestMonitorInfoProvider() {}; 17 TestMonitorInfoProvider::~TestMonitorInfoProvider() {};
17 18
18 void TestMonitorInfoProvider::AddMonitor(const gfx::Rect& bounds, 19 void TestMonitorInfoProvider::AddMonitor(const gfx::Rect& bounds,
19 const gfx::Rect& work_area) { 20 const gfx::Rect& work_area) {
20 DCHECK(bounds.Contains(work_area)); 21 DCHECK(bounds.Contains(work_area));
21 monitor_bounds_.push_back(bounds); 22 monitor_bounds_.push_back(bounds);
22 work_areas_.push_back(work_area); 23 work_areas_.push_back(work_area);
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 { // Check that a window which hangs out of the screen get moved back in. 380 { // Check that a window which hangs out of the screen get moved back in.
380 gfx::Rect window_bounds; 381 gfx::Rect window_bounds;
381 GetWindowBounds(p1024x768, p1024x768, gfx::Rect(), gfx::Rect(), 382 GetWindowBounds(p1024x768, p1024x768, gfx::Rect(), gfx::Rect(),
382 gfx::Rect(), DEFAULT, NULL, 383 gfx::Rect(), DEFAULT, NULL,
383 gfx::Rect(1020, 700, 100, 100), &window_bounds); 384 gfx::Rect(1020, 700, 100, 100), &window_bounds);
384 EXPECT_EQ("924,668 100x100", window_bounds.ToString()); 385 EXPECT_EQ("924,668 100x100", window_bounds.ToString());
385 } 386 }
386 } 387 }
387 388
388 #endif // defined(OS_MACOSX) 389 #endif // defined(OS_MACOSX)
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698