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

Side by Side Diff: ash/shell/shell_delegate_impl.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/shell/shell_delegate_impl.h ('k') | ash/shell_delegate.h » ('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/shell/shell_delegate_impl.h" 5 #include "ash/shell/shell_delegate_impl.h"
6 6
7 #include "ash/accessibility_delegate.h" 7 #include "ash/accessibility_delegate.h"
8 #include "ash/default_accessibility_delegate.h" 8 #include "ash/default_accessibility_delegate.h"
9 #include "ash/default_user_wallpaper_delegate.h" 9 #include "ash/default_user_wallpaper_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/session_state_delegate_stub.h" 14 #include "ash/session_state_delegate_stub.h"
16 #include "ash/shell/context_menu.h" 15 #include "ash/shell/context_menu.h"
17 #include "ash/shell/example_factory.h" 16 #include "ash/shell/example_factory.h"
18 #include "ash/shell/keyboard_controller_proxy_stub.h" 17 #include "ash/shell/keyboard_controller_proxy_stub.h"
19 #include "ash/shell/shelf_delegate_impl.h" 18 #include "ash/shell/shelf_delegate_impl.h"
20 #include "ash/shell/toplevel_window.h" 19 #include "ash/shell/toplevel_window.h"
21 #include "ash/shell_window_ids.h" 20 #include "ash/shell_window_ids.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 return new MediaDelegateImpl; 164 return new MediaDelegateImpl;
166 } 165 }
167 166
168 ui::MenuModel* ShellDelegateImpl::CreateContextMenu( 167 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(
169 aura::Window* root, 168 aura::Window* root,
170 ash::ShelfItemDelegate* item_delegate, 169 ash::ShelfItemDelegate* item_delegate,
171 ash::ShelfItem* item) { 170 ash::ShelfItem* item) {
172 return new ContextMenu(root); 171 return new ContextMenu(root);
173 } 172 }
174 173
175 WindowTreeHostFactory* ShellDelegateImpl::CreateWindowTreeHostFactory() {
176 return WindowTreeHostFactory::Create();
177 }
178
179 GPUSupport* ShellDelegateImpl::CreateGPUSupport() { 174 GPUSupport* ShellDelegateImpl::CreateGPUSupport() {
180 // Real GPU support depends on src/content, so just use a stub. 175 // Real GPU support depends on src/content, so just use a stub.
181 return new GPUSupportStub; 176 return new GPUSupportStub;
182 } 177 }
183 178
184 base::string16 ShellDelegateImpl::GetProductName() const { 179 base::string16 ShellDelegateImpl::GetProductName() const {
185 return base::string16(); 180 return base::string16();
186 } 181 }
187 182
188 } // namespace shell 183 } // namespace shell
189 } // namespace ash 184 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/shell_delegate_impl.h ('k') | ash/shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698