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

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: rebase Created 6 years, 8 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') | ash/wm/maximize_mode/maximize_mode_window_manager.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/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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 return new MediaDelegateImpl; 145 return new MediaDelegateImpl;
147 } 146 }
148 147
149 ui::MenuModel* TestShellDelegate::CreateContextMenu( 148 ui::MenuModel* TestShellDelegate::CreateContextMenu(
150 aura::Window* root, 149 aura::Window* root,
151 ash::ShelfItemDelegate* item_delegate, 150 ash::ShelfItemDelegate* item_delegate,
152 ash::ShelfItem* item) { 151 ash::ShelfItem* item) {
153 return NULL; 152 return NULL;
154 } 153 }
155 154
156 WindowTreeHostFactory* TestShellDelegate::CreateWindowTreeHostFactory() {
157 return WindowTreeHostFactory::Create();
158 }
159
160 GPUSupport* TestShellDelegate::CreateGPUSupport() { 155 GPUSupport* TestShellDelegate::CreateGPUSupport() {
161 // Real GPU support depends on src/content, so just use a stub. 156 // Real GPU support depends on src/content, so just use a stub.
162 return new GPUSupportStub; 157 return new GPUSupportStub;
163 } 158 }
164 159
165 base::string16 TestShellDelegate::GetProductName() const { 160 base::string16 TestShellDelegate::GetProductName() const {
166 return base::string16(); 161 return base::string16();
167 } 162 }
168 163
169 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { 164 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() {
170 return test_session_state_delegate_; 165 return test_session_state_delegate_;
171 } 166 }
172 167
173 } // namespace test 168 } // namespace test
174 } // namespace ash 169 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | ash/wm/maximize_mode/maximize_mode_window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698