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

Side by Side Diff: ash/test/ash_test_base.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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
« no previous file with comments | « ash/system/win/audio/tray_audio_delegate_win.h ('k') | ash/test/ash_test_base.cc » ('j') | 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 #ifndef ASH_TEST_ASH_TEST_BASE_H_ 5 #ifndef ASH_TEST_ASH_TEST_BASE_H_
6 #define ASH_TEST_ASH_TEST_BASE_H_ 6 #define ASH_TEST_ASH_TEST_BASE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #if defined(OS_WIN) 46 #if defined(OS_WIN)
47 class TestMetroViewerProcessHost; 47 class TestMetroViewerProcessHost;
48 #endif 48 #endif
49 49
50 class AshTestBase : public testing::Test { 50 class AshTestBase : public testing::Test {
51 public: 51 public:
52 AshTestBase(); 52 AshTestBase();
53 virtual ~AshTestBase(); 53 virtual ~AshTestBase();
54 54
55 // testing::Test: 55 // testing::Test:
56 virtual void SetUp() OVERRIDE; 56 virtual void SetUp() override;
57 virtual void TearDown() OVERRIDE; 57 virtual void TearDown() override;
58 58
59 // Update the display configuration as given in |display_specs|. 59 // Update the display configuration as given in |display_specs|.
60 // See ash::test::DisplayManagerTestApi::UpdateDisplay for more details. 60 // See ash::test::DisplayManagerTestApi::UpdateDisplay for more details.
61 void UpdateDisplay(const std::string& display_specs); 61 void UpdateDisplay(const std::string& display_specs);
62 62
63 // Returns a root Window. Usually this is the active root Window, but that 63 // Returns a root Window. Usually this is the active root Window, but that
64 // method can return NULL sometimes, and in those cases, we fall back on the 64 // method can return NULL sometimes, and in those cases, we fall back on the
65 // primary root Window. 65 // primary root Window.
66 aura::Window* CurrentContext(); 66 aura::Window* CurrentContext();
67 67
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 virtual ~NoSessionAshTestBase() {} 154 virtual ~NoSessionAshTestBase() {}
155 155
156 private: 156 private:
157 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase); 157 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
158 }; 158 };
159 159
160 } // namespace test 160 } // namespace test
161 } // namespace ash 161 } // namespace ash
162 162
163 #endif // ASH_TEST_ASH_TEST_BASE_H_ 163 #endif // ASH_TEST_ASH_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ash/system/win/audio/tray_audio_delegate_win.h ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698