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

Side by Side Diff: chrome/browser/ui/ash/window_positioner_unittest.cc

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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 "ash/wm/window_positioner.h" 5 #include "ash/wm/window_positioner.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/test/ash_test_base.h" 8 #include "ash/test/ash_test_base.h"
9 #include "ash/test/test_shell_delegate.h" 9 #include "ash/test/test_shell_delegate.h"
10 #include "ash/wm/window_resizer.h" 10 #include "ash/wm/window_resizer.h"
(...skipping 15 matching lines...) Expand all
26 26
27 namespace { 27 namespace {
28 28
29 // A browser window proxy which is able to associate an aura native window with 29 // A browser window proxy which is able to associate an aura native window with
30 // it. 30 // it.
31 class TestBrowserWindowAura : public TestBrowserWindow { 31 class TestBrowserWindowAura : public TestBrowserWindow {
32 public: 32 public:
33 explicit TestBrowserWindowAura(aura::Window* native_window); 33 explicit TestBrowserWindowAura(aura::Window* native_window);
34 virtual ~TestBrowserWindowAura(); 34 virtual ~TestBrowserWindowAura();
35 35
36 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE { 36 virtual gfx::NativeWindow GetNativeWindow() override {
37 return native_window_; 37 return native_window_;
38 } 38 }
39 39
40 private: 40 private:
41 gfx::NativeWindow native_window_; 41 gfx::NativeWindow native_window_;
42 42
43 DISALLOW_COPY_AND_ASSIGN(TestBrowserWindowAura); 43 DISALLOW_COPY_AND_ASSIGN(TestBrowserWindowAura);
44 }; 44 };
45 45
46 TestBrowserWindowAura::TestBrowserWindowAura(aura::Window *native_window) 46 TestBrowserWindowAura::TestBrowserWindowAura(aura::Window *native_window)
47 : native_window_(native_window) { 47 : native_window_(native_window) {
48 } 48 }
49 49
50 TestBrowserWindowAura::~TestBrowserWindowAura() {} 50 TestBrowserWindowAura::~TestBrowserWindowAura() {}
51 51
52 } // namespace 52 } // namespace
53 53
54 // A test class for preparing window positioner tests - it creates a testing 54 // A test class for preparing window positioner tests - it creates a testing
55 // base by adding a window and a popup which can be independently 55 // base by adding a window and a popup which can be independently
56 // positioned to see where the positioner will place the window. 56 // positioned to see where the positioner will place the window.
57 class WindowPositionerTest : public AshTestBase { 57 class WindowPositionerTest : public AshTestBase {
58 public: 58 public:
59 WindowPositionerTest(); 59 WindowPositionerTest();
60 60
61 virtual void SetUp() OVERRIDE; 61 virtual void SetUp() override;
62 virtual void TearDown() OVERRIDE; 62 virtual void TearDown() override;
63 63
64 protected: 64 protected:
65 aura::Window* window() { return window_.get(); } 65 aura::Window* window() { return window_.get(); }
66 aura::Window* popup() { return popup_.get(); } 66 aura::Window* popup() { return popup_.get(); }
67 67
68 Browser* window_browser() { return window_owning_browser_.get(); } 68 Browser* window_browser() { return window_owning_browser_.get(); }
69 Browser* popup_browser() { return popup_owning_browser_.get(); } 69 Browser* popup_browser() { return popup_owning_browser_.get(); }
70 70
71 WindowPositioner* window_positioner() { return window_positioner_; } 71 WindowPositioner* window_positioner() { return window_positioner_; }
72 72
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 273
274 // Check that the popup is placed full screen. 274 // Check that the popup is placed full screen.
275 gfx::Rect full = window_positioner()->GetPopupPosition(pop_position); 275 gfx::Rect full = window_positioner()->GetPopupPosition(pop_position);
276 EXPECT_EQ(gfx::Rect(work_area.x(), work_area.y(), 276 EXPECT_EQ(gfx::Rect(work_area.x(), work_area.y(),
277 pop_position.width(), pop_position.height()), 277 pop_position.width(), pop_position.height()),
278 full); 278 full);
279 } 279 }
280 280
281 } // namespace test 281 } // namespace test
282 } // namespace ash 282 } // namespace ash
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/volume_controller_chromeos.h ('k') | chrome/browser/ui/aura/active_desktop_monitor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698