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

Side by Side Diff: trunk/src/ash/shell/shell_delegate_impl.cc

Issue 186123004: Revert 255385 "aura: Remove client::UserActionClient." (Closed) Base URL: svn://svn.chromium.org/chrome/
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
« no previous file with comments | « trunk/src/ash/shell/shell_delegate_impl.h ('k') | trunk/src/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/caps_lock_delegate_stub.h" 8 #include "ash/caps_lock_delegate_stub.h"
9 #include "ash/default_accessibility_delegate.h" 9 #include "ash/default_accessibility_delegate.h"
10 #include "ash/default_user_wallpaper_delegate.h" 10 #include "ash/default_user_wallpaper_delegate.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 } 148 }
149 149
150 ash::NewWindowDelegate* ShellDelegateImpl::CreateNewWindowDelegate() { 150 ash::NewWindowDelegate* ShellDelegateImpl::CreateNewWindowDelegate() {
151 return new NewWindowDelegateImpl; 151 return new NewWindowDelegateImpl;
152 } 152 }
153 153
154 ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() { 154 ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() {
155 return new MediaDelegateImpl; 155 return new MediaDelegateImpl;
156 } 156 }
157 157
158 aura::client::UserActionClient* ShellDelegateImpl::CreateUserActionClient() {
159 return NULL;
160 }
161
158 ui::MenuModel* ShellDelegateImpl::CreateContextMenu( 162 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(
159 aura::Window* root, 163 aura::Window* root,
160 ash::ShelfItemDelegate* item_delegate, 164 ash::ShelfItemDelegate* item_delegate,
161 ash::ShelfItem* item) { 165 ash::ShelfItem* item) {
162 return new ContextMenu(root); 166 return new ContextMenu(root);
163 } 167 }
164 168
165 WindowTreeHostFactory* ShellDelegateImpl::CreateWindowTreeHostFactory() { 169 WindowTreeHostFactory* ShellDelegateImpl::CreateWindowTreeHostFactory() {
166 return WindowTreeHostFactory::Create(); 170 return WindowTreeHostFactory::Create();
167 } 171 }
168 172
169 GPUSupport* ShellDelegateImpl::CreateGPUSupport() { 173 GPUSupport* ShellDelegateImpl::CreateGPUSupport() {
170 // Real GPU support depends on src/content, so just use a stub. 174 // Real GPU support depends on src/content, so just use a stub.
171 return new GPUSupportStub; 175 return new GPUSupportStub;
172 } 176 }
173 177
174 base::string16 ShellDelegateImpl::GetProductName() const { 178 base::string16 ShellDelegateImpl::GetProductName() const {
175 return base::string16(); 179 return base::string16();
176 } 180 }
177 181
178 } // namespace shell 182 } // namespace shell
179 } // namespace ash 183 } // namespace ash
OLDNEW
« no previous file with comments | « trunk/src/ash/shell/shell_delegate_impl.h ('k') | trunk/src/ash/shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698