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

Side by Side Diff: ash/test/test_shell_delegate.cc

Issue 21052007: aura: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanupcompositor: UseRealGLBindings for CompositingRWHVBrowserTests on win_rel Created 7 years, 4 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 | « no previous file | ash/test/test_suite.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 #include "ash/test/test_shell_delegate.h" 5 #include "ash/test/test_shell_delegate.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "ash/caps_lock_delegate_stub.h" 9 #include "ash/caps_lock_delegate_stub.h"
10 #include "ash/host/root_window_host_factory.h" 10 #include "ash/host/root_window_host_factory.h"
11 #include "ash/session_state_delegate.h" 11 #include "ash/session_state_delegate.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ash/shell_window_ids.h" 13 #include "ash/shell_window_ids.h"
14 #include "ash/test/test_launcher_delegate.h" 14 #include "ash/test/test_launcher_delegate.h"
15 #include "ash/test/test_session_state_delegate.h" 15 #include "ash/test/test_session_state_delegate.h"
16 #include "ash/wm/window_util.h" 16 #include "ash/wm/window_util.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "content/public/test/test_browser_context.h" 18 #include "content/public/test/test_browser_context.h"
19 #include "ui/aura/window.h" 19 #include "ui/aura/window.h"
20 #include "ui/compositor/compositor.h"
20 21
21 namespace ash { 22 namespace ash {
22 namespace test { 23 namespace test {
23 24
24 TestShellDelegate::TestShellDelegate() 25 TestShellDelegate::TestShellDelegate()
25 : spoken_feedback_enabled_(false), 26 : spoken_feedback_enabled_(false),
26 high_contrast_enabled_(false), 27 high_contrast_enabled_(false),
27 screen_magnifier_enabled_(false), 28 screen_magnifier_enabled_(false),
28 screen_magnifier_type_(kDefaultMagnifierType), 29 screen_magnifier_type_(kDefaultMagnifierType),
29 large_cursor_enabled_(false), 30 large_cursor_enabled_(false),
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 207
207 ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::RootWindow* root) { 208 ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::RootWindow* root) {
208 return NULL; 209 return NULL;
209 } 210 }
210 211
211 double TestShellDelegate::GetSavedScreenMagnifierScale() { 212 double TestShellDelegate::GetSavedScreenMagnifierScale() {
212 return std::numeric_limits<double>::min(); 213 return std::numeric_limits<double>::min();
213 } 214 }
214 215
215 RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() { 216 RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() {
217 // The ContextFactory must exist before any Compositors are created.
218 bool allow_test_contexts = true;
219 ui::Compositor::InitializeContextFactoryForTests(allow_test_contexts);
220
216 return RootWindowHostFactory::Create(); 221 return RootWindowHostFactory::Create();
217 } 222 }
218 223
219 base::string16 TestShellDelegate::GetProductName() const { 224 base::string16 TestShellDelegate::GetProductName() const {
220 return base::string16(); 225 return base::string16();
221 } 226 }
222 227
223 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { 228 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() {
224 return test_session_state_delegate_; 229 return test_session_state_delegate_;
225 } 230 }
226 231
227 } // namespace test 232 } // namespace test
228 } // namespace ash 233 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698