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

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

Issue 201573015: Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 #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/default_accessibility_delegate.h" 9 #include "ash/default_accessibility_delegate.h"
10 #include "ash/gpu_support_stub.h" 10 #include "ash/gpu_support_stub.h"
11 #include "ash/host/window_tree_host_factory.h"
12 #include "ash/media_delegate.h" 11 #include "ash/media_delegate.h"
13 #include "ash/new_window_delegate.h" 12 #include "ash/new_window_delegate.h"
14 #include "ash/session_state_delegate.h" 13 #include "ash/session_state_delegate.h"
15 #include "ash/shell.h" 14 #include "ash/shell.h"
16 #include "ash/shell/keyboard_controller_proxy_stub.h" 15 #include "ash/shell/keyboard_controller_proxy_stub.h"
17 #include "ash/shell_window_ids.h" 16 #include "ash/shell_window_ids.h"
18 #include "ash/test/test_session_state_delegate.h" 17 #include "ash/test/test_session_state_delegate.h"
19 #include "ash/test/test_shelf_delegate.h" 18 #include "ash/test/test_shelf_delegate.h"
20 #include "ash/test/test_system_tray_delegate.h" 19 #include "ash/test/test_system_tray_delegate.h"
21 #include "ash/test/test_user_wallpaper_delegate.h" 20 #include "ash/test/test_user_wallpaper_delegate.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 return new MediaDelegateImpl; 130 return new MediaDelegateImpl;
132 } 131 }
133 132
134 ui::MenuModel* TestShellDelegate::CreateContextMenu( 133 ui::MenuModel* TestShellDelegate::CreateContextMenu(
135 aura::Window* root, 134 aura::Window* root,
136 ash::ShelfItemDelegate* item_delegate, 135 ash::ShelfItemDelegate* item_delegate,
137 ash::ShelfItem* item) { 136 ash::ShelfItem* item) {
138 return NULL; 137 return NULL;
139 } 138 }
140 139
141 WindowTreeHostFactory* TestShellDelegate::CreateWindowTreeHostFactory() {
142 return WindowTreeHostFactory::Create();
143 }
144
145 GPUSupport* TestShellDelegate::CreateGPUSupport() { 140 GPUSupport* TestShellDelegate::CreateGPUSupport() {
146 // Real GPU support depends on src/content, so just use a stub. 141 // Real GPU support depends on src/content, so just use a stub.
147 return new GPUSupportStub; 142 return new GPUSupportStub;
148 } 143 }
149 144
150 base::string16 TestShellDelegate::GetProductName() const { 145 base::string16 TestShellDelegate::GetProductName() const {
151 return base::string16(); 146 return base::string16();
152 } 147 }
153 148
154 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { 149 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() {
155 return test_session_state_delegate_; 150 return test_session_state_delegate_;
156 } 151 }
157 152
158 } // namespace test 153 } // namespace test
159 } // namespace ash 154 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698