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

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

Issue 132173006: Provide real GPUSupport to ash for Chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win (gpu_support) Created 6 years, 10 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/test/test_shell_delegate.h ('k') | chrome/browser/ui/ash/ash_init.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/default_accessibility_delegate.h" 10 #include "ash/default_accessibility_delegate.h"
11 #include "ash/gpu_support_stub.h"
11 #include "ash/host/root_window_host_factory.h" 12 #include "ash/host/root_window_host_factory.h"
12 #include "ash/media_delegate.h" 13 #include "ash/media_delegate.h"
13 #include "ash/new_window_delegate.h" 14 #include "ash/new_window_delegate.h"
14 #include "ash/session_state_delegate.h" 15 #include "ash/session_state_delegate.h"
15 #include "ash/shell.h" 16 #include "ash/shell.h"
16 #include "ash/shell/keyboard_controller_proxy_stub.h" 17 #include "ash/shell/keyboard_controller_proxy_stub.h"
17 #include "ash/shell_window_ids.h" 18 #include "ash/shell_window_ids.h"
18 #include "ash/test/test_session_state_delegate.h" 19 #include "ash/test/test_session_state_delegate.h"
19 #include "ash/test/test_shelf_delegate.h" 20 #include "ash/test/test_shelf_delegate.h"
20 #include "ash/test/test_system_tray_delegate.h" 21 #include "ash/test/test_system_tray_delegate.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 aura::Window* root, 144 aura::Window* root,
144 ash::ShelfItemDelegate* item_delegate, 145 ash::ShelfItemDelegate* item_delegate,
145 ash::LauncherItem* item) { 146 ash::LauncherItem* item) {
146 return NULL; 147 return NULL;
147 } 148 }
148 149
149 WindowTreeHostFactory* TestShellDelegate::CreateWindowTreeHostFactory() { 150 WindowTreeHostFactory* TestShellDelegate::CreateWindowTreeHostFactory() {
150 return WindowTreeHostFactory::Create(); 151 return WindowTreeHostFactory::Create();
151 } 152 }
152 153
154 GPUSupport* TestShellDelegate::CreateGPUSupport() {
155 // Real GPU support depends on src/content, so just use a stub.
156 return new GPUSupportStub;
157 }
158
153 base::string16 TestShellDelegate::GetProductName() const { 159 base::string16 TestShellDelegate::GetProductName() const {
154 return base::string16(); 160 return base::string16();
155 } 161 }
156 162
157 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { 163 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() {
158 return test_session_state_delegate_; 164 return test_session_state_delegate_;
159 } 165 }
160 166
161 } // namespace test 167 } // namespace test
162 } // namespace ash 168 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698