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

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

Issue 1949823002: WIP: Eliminate event.target() usage from TrayEventFilter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: container delegate Created 4 years, 7 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
« 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/app_list/app_list_presenter_delegate_factory.h" 8 #include "ash/app_list/app_list_presenter_delegate_factory.h"
9 #include "ash/container_delegate_aura.h"
9 #include "ash/default_accessibility_delegate.h" 10 #include "ash/default_accessibility_delegate.h"
10 #include "ash/default_user_wallpaper_delegate.h" 11 #include "ash/default_user_wallpaper_delegate.h"
11 #include "ash/gpu_support_stub.h" 12 #include "ash/gpu_support_stub.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/pointer_watcher_delegate_aura.h" 15 #include "ash/pointer_watcher_delegate_aura.h"
15 #include "ash/session/session_state_delegate.h" 16 #include "ash/session/session_state_delegate.h"
16 #include "ash/shell/context_menu.h" 17 #include "ash/shell/context_menu.h"
17 #include "ash/shell/example_factory.h" 18 #include "ash/shell/example_factory.h"
18 #include "ash/shell/shelf_delegate_impl.h" 19 #include "ash/shell/shelf_delegate_impl.h"
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 } 249 }
249 250
250 ash::NewWindowDelegate* ShellDelegateImpl::CreateNewWindowDelegate() { 251 ash::NewWindowDelegate* ShellDelegateImpl::CreateNewWindowDelegate() {
251 return new NewWindowDelegateImpl; 252 return new NewWindowDelegateImpl;
252 } 253 }
253 254
254 ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() { 255 ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() {
255 return new MediaDelegateImpl; 256 return new MediaDelegateImpl;
256 } 257 }
257 258
259 std::unique_ptr<ash::ContainerDelegate>
260 ShellDelegateImpl::CreateContainerDelegate() {
261 return base::WrapUnique(new ContainerDelegateAura);
262 }
263
258 std::unique_ptr<ash::PointerWatcherDelegate> 264 std::unique_ptr<ash::PointerWatcherDelegate>
259 ShellDelegateImpl::CreatePointerWatcherDelegate() { 265 ShellDelegateImpl::CreatePointerWatcherDelegate() {
260 return base::WrapUnique(new PointerWatcherDelegateAura); 266 return base::WrapUnique(new PointerWatcherDelegateAura);
261 } 267 }
262 268
263 ui::MenuModel* ShellDelegateImpl::CreateContextMenu( 269 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(
264 ash::Shelf* shelf, 270 ash::Shelf* shelf,
265 const ash::ShelfItem* item) { 271 const ash::ShelfItem* item) {
266 return new ContextMenu(shelf); 272 return new ContextMenu(shelf);
267 } 273 }
268 274
269 GPUSupport* ShellDelegateImpl::CreateGPUSupport() { 275 GPUSupport* ShellDelegateImpl::CreateGPUSupport() {
270 // Real GPU support depends on src/content, so just use a stub. 276 // Real GPU support depends on src/content, so just use a stub.
271 return new GPUSupportStub; 277 return new GPUSupportStub;
272 } 278 }
273 279
274 base::string16 ShellDelegateImpl::GetProductName() const { 280 base::string16 ShellDelegateImpl::GetProductName() const {
275 return base::string16(); 281 return base::string16();
276 } 282 }
277 283
278 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { 284 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const {
279 return gfx::Image(); 285 return gfx::Image();
280 } 286 }
281 287
282 } // namespace shell 288 } // namespace shell
283 } // namespace ash 289 } // 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