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

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

Issue 280863002: Reduce creation of ViewsDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add widget includes for undef CreateWindow 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
« no previous file with comments | « ash/screensaver/screensaver_view_unittest.cc ('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"
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"
17 #include "ui/wm/public/window_types.h" 16 #include "ui/wm/public/window_types.h"
18 17
19 #if defined(OS_WIN) 18 #if defined(OS_WIN)
20 #include "ui/base/win/scoped_ole_initializer.h" 19 #include "ui/base/win/scoped_ole_initializer.h"
21 #endif 20 #endif
22 21
22 namespace gfx {
23 class Rect;
24 }
25
23 namespace aura { 26 namespace aura {
24 class RootWindow; 27 class RootWindow;
25 class Window; 28 class Window;
26 class WindowDelegate; 29 class WindowDelegate;
27 30
28 namespace test { 31 namespace test {
29 class EventGenerator; 32 class EventGenerator;
30 } // namespace test 33 } // namespace test
31 } // namespace aura 34 } // namespace aura
32 35
33 namespace ash { 36 namespace ash {
34 class DisplayManager; 37 class DisplayManager;
35 38
36 namespace test { 39 namespace test {
37 40
38 class AshTestHelper; 41 class AshTestHelper;
39 class TestScreenshotDelegate; 42 class TestScreenshotDelegate;
40 class TestSystemTrayDelegate; 43 class TestSystemTrayDelegate;
41 #if defined(OS_WIN) 44 #if defined(OS_WIN)
42 class TestMetroViewerProcessHost; 45 class TestMetroViewerProcessHost;
43 #endif 46 #endif
44 47
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
53 class AshTestBase : public testing::Test { 48 class AshTestBase : public testing::Test {
54 public: 49 public:
55 AshTestBase(); 50 AshTestBase();
56 virtual ~AshTestBase(); 51 virtual ~AshTestBase();
57 52
58 // testing::Test: 53 // testing::Test:
59 virtual void SetUp() OVERRIDE; 54 virtual void SetUp() OVERRIDE;
60 virtual void TearDown() OVERRIDE; 55 virtual void TearDown() OVERRIDE;
61 56
62 // Update the display configuration as given in |display_specs|. 57 // Update the display configuration as given in |display_specs|.
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 virtual ~NoSessionAshTestBase() {} 152 virtual ~NoSessionAshTestBase() {}
158 153
159 private: 154 private:
160 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase); 155 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
161 }; 156 };
162 157
163 } // namespace test 158 } // namespace test
164 } // namespace ash 159 } // namespace ash
165 160
166 #endif // ASH_TEST_ASH_TEST_BASE_H_ 161 #endif // ASH_TEST_ASH_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ash/screensaver/screensaver_view_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698