OLD | NEW |
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" |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 virtual gfx::Display GetDisplayNearestWindow( | 57 virtual gfx::Display GetDisplayNearestWindow( |
58 gfx::NativeView view) const OVERRIDE { | 58 gfx::NativeView view) const OVERRIDE { |
59 #if defined(USE_AURA) | 59 #if defined(USE_AURA) |
60 return GetDisplayMatching(view->GetBoundsInScreen()); | 60 return GetDisplayMatching(view->GetBoundsInScreen()); |
61 #else | 61 #else |
62 NOTREACHED(); | 62 NOTREACHED(); |
63 return gfx::Display(); | 63 return gfx::Display(); |
64 #endif | 64 #endif |
65 } | 65 } |
66 | 66 |
| 67 virtual bool GetDisplayColorProfile( |
| 68 gfx::NativeView view, std::vector<char>* color_profile) const OVERRIDE { |
| 69 return false; |
| 70 } |
| 71 |
67 virtual gfx::Display GetDisplayNearestPoint( | 72 virtual gfx::Display GetDisplayNearestPoint( |
68 const gfx::Point& point) const OVERRIDE { | 73 const gfx::Point& point) const OVERRIDE { |
69 NOTREACHED(); | 74 NOTREACHED(); |
70 return gfx::Display(); | 75 return gfx::Display(); |
71 } | 76 } |
72 | 77 |
73 virtual gfx::Display GetDisplayMatching( | 78 virtual gfx::Display GetDisplayMatching( |
74 const gfx::Rect& match_rect) const OVERRIDE { | 79 const gfx::Rect& match_rect) const OVERRIDE { |
75 int max_area = 0; | 80 int max_area = 0; |
76 size_t max_area_index = 0; | 81 size_t max_area_index = 0; |
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
463 { // Check that a window which hangs out of the screen get moved back in. | 468 { // Check that a window which hangs out of the screen get moved back in. |
464 gfx::Rect window_bounds; | 469 gfx::Rect window_bounds; |
465 GetWindowBounds(p1024x768, p1024x768, gfx::Rect(), gfx::Rect(), | 470 GetWindowBounds(p1024x768, p1024x768, gfx::Rect(), gfx::Rect(), |
466 gfx::Rect(), DEFAULT, NULL, | 471 gfx::Rect(), DEFAULT, NULL, |
467 gfx::Rect(1020, 700, 100, 100), &window_bounds); | 472 gfx::Rect(1020, 700, 100, 100), &window_bounds); |
468 EXPECT_EQ("924,668 100x100", window_bounds.ToString()); | 473 EXPECT_EQ("924,668 100x100", window_bounds.ToString()); |
469 } | 474 } |
470 } | 475 } |
471 | 476 |
472 #endif // defined(OS_MACOSX) | 477 #endif // defined(OS_MACOSX) |
OLD | NEW |