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

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

Issue 15966003: Revert 201806 "Create MetroViewerProcessHost as a common base fo..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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 | « trunk/src/ash/test/DEPS ('k') | trunk/src/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')
Property Changes:
Deleted: svn:mergeinfo
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.h" 11 #include "base/message_loop.h"
12 #include "base/threading/thread.h"
13 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
14 #include "third_party/skia/include/core/SkColor.h" 13 #include "third_party/skia/include/core/SkColor.h"
15 #include "ui/aura/client/window_types.h" 14 #include "ui/aura/client/window_types.h"
16 #include "ui/views/test/test_views_delegate.h" 15 #include "ui/views/test/test_views_delegate.h"
17 16
18 #if defined(OS_WIN) 17 #if defined(OS_WIN)
19 #include "ui/base/win/scoped_ole_initializer.h" 18 #include "ui/base/win/scoped_ole_initializer.h"
20 #endif 19 #endif
21 20
22 namespace aura { 21 namespace aura {
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 void SetUserLoggedIn(bool user_logged_in); 102 void SetUserLoggedIn(bool user_logged_in);
104 void SetCanLockScreen(bool can_lock_screen); 103 void SetCanLockScreen(bool can_lock_screen);
105 104
106 private: 105 private:
107 bool setup_called_; 106 bool setup_called_;
108 bool teardown_called_; 107 bool teardown_called_;
109 base::MessageLoopForUI message_loop_; 108 base::MessageLoopForUI message_loop_;
110 scoped_ptr<AshTestHelper> ash_test_helper_; 109 scoped_ptr<AshTestHelper> ash_test_helper_;
111 scoped_ptr<aura::test::EventGenerator> event_generator_; 110 scoped_ptr<aura::test::EventGenerator> event_generator_;
112 #if defined(OS_WIN) 111 #if defined(OS_WIN)
113 // Note that the order is important here as ipc_thread_ should be destroyed
114 // after metro_viewer_host_->channel_.
115 scoped_ptr<base::Thread> ipc_thread_;
116 scoped_ptr<TestMetroViewerProcessHost> metro_viewer_host_; 112 scoped_ptr<TestMetroViewerProcessHost> metro_viewer_host_;
117 ui::ScopedOleInitializer ole_initializer_; 113 ui::ScopedOleInitializer ole_initializer_;
118 #endif 114 #endif
119 115
120 DISALLOW_COPY_AND_ASSIGN(AshTestBase); 116 DISALLOW_COPY_AND_ASSIGN(AshTestBase);
121 }; 117 };
122 118
123 } // namespace test 119 } // namespace test
124 } // namespace ash 120 } // namespace ash
125 121
126 #endif // ASH_TEST_ASH_TEST_BASE_H_ 122 #endif // ASH_TEST_ASH_TEST_BASE_H_
OLDNEW
« no previous file with comments | « trunk/src/ash/test/DEPS ('k') | trunk/src/ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698