| 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.h" | 5 #include "chrome/browser/ui/window_sizer.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 WindowSizerTestWithBrowser::~WindowSizerTestWithBrowser() { | 56 WindowSizerTestWithBrowser::~WindowSizerTestWithBrowser() { |
| 57 } | 57 } |
| 58 | 58 |
| 59 // A browser window proxy which is able to associate an aura native window with | 59 // A browser window proxy which is able to associate an aura native window with |
| 60 // it. | 60 // it. |
| 61 class TestBrowserWindowAura : public TestBrowserWindow { | 61 class TestBrowserWindowAura : public TestBrowserWindow { |
| 62 public: | 62 public: |
| 63 TestBrowserWindowAura(Browser* browser, aura::Window* native_window); | 63 TestBrowserWindowAura(Browser* browser, aura::Window* native_window); |
| 64 virtual ~TestBrowserWindowAura(); | 64 virtual ~TestBrowserWindowAura(); |
| 65 | 65 |
| 66 virtual gfx::NativeWindow GetNativeHandle() OVERRIDE { | 66 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE { |
| 67 return native_window_; | 67 return native_window_; |
| 68 } | 68 } |
| 69 | 69 |
| 70 private: | 70 private: |
| 71 gfx::NativeWindow native_window_; | 71 gfx::NativeWindow native_window_; |
| 72 | 72 |
| 73 DISALLOW_COPY_AND_ASSIGN(TestBrowserWindowAura); | 73 DISALLOW_COPY_AND_ASSIGN(TestBrowserWindowAura); |
| 74 }; | 74 }; |
| 75 | 75 |
| 76 } // namespace | 76 } // namespace |
| (...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 710 } | 710 } |
| 711 | 711 |
| 712 { // Check that a window which hangs out of the screen get moved back in. | 712 { // Check that a window which hangs out of the screen get moved back in. |
| 713 gfx::Rect window_bounds; | 713 gfx::Rect window_bounds; |
| 714 GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(), gfx::Rect(), | 714 GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(), gfx::Rect(), |
| 715 gfx::Rect(), DEFAULT, &window_bounds, NULL, | 715 gfx::Rect(), DEFAULT, &window_bounds, NULL, |
| 716 gfx::Rect(1020, 700, 100, 100)); | 716 gfx::Rect(1020, 700, 100, 100)); |
| 717 EXPECT_EQ(gfx::Rect(924, 668, 100, 100), window_bounds); | 717 EXPECT_EQ(gfx::Rect(924, 668, 100, 100), window_bounds); |
| 718 } | 718 } |
| 719 } | 719 } |
| OLD | NEW |