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

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

Issue 286753002: Revert 270290 "Reduce creation of ViewsDelegate" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
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"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/threading/thread.h" 12 #include "base/threading/thread.h"
13 #include "content/public/test/test_browser_thread_bundle.h" 13 #include "content/public/test/test_browser_thread_bundle.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "third_party/skia/include/core/SkColor.h" 15 #include "third_party/skia/include/core/SkColor.h"
16 #include "ui/views/test/test_views_delegate.h"
16 #include "ui/wm/public/window_types.h" 17 #include "ui/wm/public/window_types.h"
17 18
18 #if defined(OS_WIN) 19 #if defined(OS_WIN)
19 #include "ui/base/win/scoped_ole_initializer.h" 20 #include "ui/base/win/scoped_ole_initializer.h"
20 #endif 21 #endif
21 22
22 namespace gfx {
23 class Rect;
24 }
25
26 namespace aura { 23 namespace aura {
27 class RootWindow; 24 class RootWindow;
28 class Window; 25 class Window;
29 class WindowDelegate; 26 class WindowDelegate;
30 27
31 namespace test { 28 namespace test {
32 class EventGenerator; 29 class EventGenerator;
33 } // namespace test 30 } // namespace test
34 } // namespace aura 31 } // namespace aura
35 32
36 namespace ash { 33 namespace ash {
37 class DisplayManager; 34 class DisplayManager;
38 35
39 namespace test { 36 namespace test {
40 37
41 class AshTestHelper; 38 class AshTestHelper;
42 class TestScreenshotDelegate; 39 class TestScreenshotDelegate;
43 class TestSystemTrayDelegate; 40 class TestSystemTrayDelegate;
44 #if defined(OS_WIN) 41 #if defined(OS_WIN)
45 class TestMetroViewerProcessHost; 42 class TestMetroViewerProcessHost;
46 #endif 43 #endif
47 44
45 class AshTestViewsDelegate : public views::TestViewsDelegate {
46 public:
47 // Overriden from TestViewsDelegate.
48 virtual content::WebContents* CreateWebContents(
49 content::BrowserContext* browser_context,
50 content::SiteInstance* site_instance) OVERRIDE;
51 };
52
48 class AshTestBase : public testing::Test { 53 class AshTestBase : public testing::Test {
49 public: 54 public:
50 AshTestBase(); 55 AshTestBase();
51 virtual ~AshTestBase(); 56 virtual ~AshTestBase();
52 57
53 // testing::Test: 58 // testing::Test:
54 virtual void SetUp() OVERRIDE; 59 virtual void SetUp() OVERRIDE;
55 virtual void TearDown() OVERRIDE; 60 virtual void TearDown() OVERRIDE;
56 61
57 // Update the display configuration as given in |display_specs|. 62 // Update the display configuration as given in |display_specs|.
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 virtual ~NoSessionAshTestBase() {} 157 virtual ~NoSessionAshTestBase() {}
153 158
154 private: 159 private:
155 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase); 160 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
156 }; 161 };
157 162
158 } // namespace test 163 } // namespace test
159 } // namespace ash 164 } // namespace ash
160 165
161 #endif // ASH_TEST_ASH_TEST_BASE_H_ 166 #endif // ASH_TEST_ASH_TEST_BASE_H_
OLDNEW
« no previous file with comments | « trunk/src/ash/screensaver/screensaver_view_unittest.cc ('k') | trunk/src/ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698