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

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

Issue 2642113004: chromeos: Remove OS_WIN and OS_CHROMEOS ifdefs from ash/test (Closed)
Patch Set: Created 3 years, 11 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 | « no previous file | ash/test/ash_test_base.cc » ('j') | ash/test/ash_test_helper.cc » ('J')
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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <string> 11 #include <string>
12 12
13 #include "ash/common/material_design/material_design_controller.h" 13 #include "ash/common/material_design/material_design_controller.h"
14 #include "base/compiler_specific.h"
15 #include "base/macros.h" 14 #include "base/macros.h"
16 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
17 #include "base/threading/thread.h" 16 #include "base/threading/thread.h"
18 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
19 #include "third_party/skia/include/core/SkColor.h" 18 #include "third_party/skia/include/core/SkColor.h"
20 #include "ui/display/display.h" 19 #include "ui/display/display.h"
21 #include "ui/wm/public/window_types.h" 20 #include "ui/wm/public/window_types.h"
22 21
23 #if defined(OS_WIN)
24 #include "ui/base/win/scoped_ole_initializer.h"
25 #endif
26
27 namespace aura { 22 namespace aura {
28 class Window; 23 class Window;
29 class WindowDelegate; 24 class WindowDelegate;
30 } // namespace aura 25 } // namespace aura
31 26
32 namespace display { 27 namespace display {
33 class DisplayManager; 28 class DisplayManager;
34 29
35 namespace test { 30 namespace test {
36 class DisplayManagerTestApi; 31 class DisplayManagerTestApi;
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 friend class ash::AshTestImplAura; 183 friend class ash::AshTestImplAura;
189 184
190 bool setup_called_; 185 bool setup_called_;
191 bool teardown_called_; 186 bool teardown_called_;
192 // |SetUp()| doesn't activate session if this is set to false. 187 // |SetUp()| doesn't activate session if this is set to false.
193 bool start_session_; 188 bool start_session_;
194 MaterialDesignController::Mode material_mode_; 189 MaterialDesignController::Mode material_mode_;
195 std::unique_ptr<AshTestEnvironment> ash_test_environment_; 190 std::unique_ptr<AshTestEnvironment> ash_test_environment_;
196 std::unique_ptr<AshTestHelper> ash_test_helper_; 191 std::unique_ptr<AshTestHelper> ash_test_helper_;
197 std::unique_ptr<ui::test::EventGenerator> event_generator_; 192 std::unique_ptr<ui::test::EventGenerator> event_generator_;
198 #if defined(OS_WIN)
199 ui::ScopedOleInitializer ole_initializer_;
200 #endif
201 193
202 DISALLOW_COPY_AND_ASSIGN(AshTestBase); 194 DISALLOW_COPY_AND_ASSIGN(AshTestBase);
203 }; 195 };
204 196
205 class NoSessionAshTestBase : public AshTestBase { 197 class NoSessionAshTestBase : public AshTestBase {
206 public: 198 public:
207 NoSessionAshTestBase() { set_start_session(false); } 199 NoSessionAshTestBase() { set_start_session(false); }
208 ~NoSessionAshTestBase() override {} 200 ~NoSessionAshTestBase() override {}
209 201
210 private: 202 private:
211 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase); 203 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
212 }; 204 };
213 205
214 } // namespace test 206 } // namespace test
215 } // namespace ash 207 } // namespace ash
216 208
217 #endif // ASH_TEST_ASH_TEST_BASE_H_ 209 #endif // ASH_TEST_ASH_TEST_BASE_H_
OLDNEW
« no previous file with comments | « no previous file | ash/test/ash_test_base.cc » ('j') | ash/test/ash_test_helper.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698