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

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

Issue 2086143002: Convert TrayEventFilter to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweak Created 4 years, 6 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/app_list/app_list_presenter_delegate_factory.h" 7 #include "ash/app_list/app_list_presenter_delegate_factory.h"
8 #include "ash/common/accessibility_delegate.h" 8 #include "ash/common/accessibility_delegate.h"
9 #include "ash/common/default_accessibility_delegate.h" 9 #include "ash/common/default_accessibility_delegate.h"
10 #include "ash/common/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
11 #include "ash/common/shell_window_ids.h" 11 #include "ash/common/shell_window_ids.h"
12 #include "ash/common/system/tray/default_system_tray_delegate.h" 12 #include "ash/common/system/tray/default_system_tray_delegate.h"
13 #include "ash/common/wm/window_state.h" 13 #include "ash/common/wm/window_state.h"
14 #include "ash/container_delegate_aura.h"
15 #include "ash/default_user_wallpaper_delegate.h" 14 #include "ash/default_user_wallpaper_delegate.h"
16 #include "ash/gpu_support_stub.h" 15 #include "ash/gpu_support_stub.h"
17 #include "ash/media_delegate.h" 16 #include "ash/media_delegate.h"
18 #include "ash/new_window_delegate.h" 17 #include "ash/new_window_delegate.h"
19 #include "ash/pointer_watcher_delegate_aura.h" 18 #include "ash/pointer_watcher_delegate_aura.h"
20 #include "ash/shell.h" 19 #include "ash/shell.h"
21 #include "ash/shell/context_menu.h" 20 #include "ash/shell/context_menu.h"
22 #include "ash/shell/example_factory.h" 21 #include "ash/shell/example_factory.h"
23 #include "ash/shell/shelf_delegate_impl.h" 22 #include "ash/shell/shelf_delegate_impl.h"
24 #include "ash/shell/toplevel_window.h" 23 #include "ash/shell/toplevel_window.h"
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 } 249 }
251 250
252 ash::NewWindowDelegate* ShellDelegateImpl::CreateNewWindowDelegate() { 251 ash::NewWindowDelegate* ShellDelegateImpl::CreateNewWindowDelegate() {
253 return new NewWindowDelegateImpl; 252 return new NewWindowDelegateImpl;
254 } 253 }
255 254
256 ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() { 255 ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() {
257 return new MediaDelegateImpl; 256 return new MediaDelegateImpl;
258 } 257 }
259 258
260 std::unique_ptr<ash::ContainerDelegate>
261 ShellDelegateImpl::CreateContainerDelegate() {
262 return base::WrapUnique(new ContainerDelegateAura);
263 }
264
265 std::unique_ptr<ash::PointerWatcherDelegate> 259 std::unique_ptr<ash::PointerWatcherDelegate>
266 ShellDelegateImpl::CreatePointerWatcherDelegate() { 260 ShellDelegateImpl::CreatePointerWatcherDelegate() {
267 return base::WrapUnique(new PointerWatcherDelegateAura); 261 return base::WrapUnique(new PointerWatcherDelegateAura);
268 } 262 }
269 263
270 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(WmShelf* wm_shelf, 264 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(WmShelf* wm_shelf,
271 const ShelfItem* item) { 265 const ShelfItem* item) {
272 return new ContextMenu(wm_shelf); 266 return new ContextMenu(wm_shelf);
273 } 267 }
274 268
275 GPUSupport* ShellDelegateImpl::CreateGPUSupport() { 269 GPUSupport* ShellDelegateImpl::CreateGPUSupport() {
276 // Real GPU support depends on src/content, so just use a stub. 270 // Real GPU support depends on src/content, so just use a stub.
277 return new GPUSupportStub; 271 return new GPUSupportStub;
278 } 272 }
279 273
280 base::string16 ShellDelegateImpl::GetProductName() const { 274 base::string16 ShellDelegateImpl::GetProductName() const {
281 return base::string16(); 275 return base::string16();
282 } 276 }
283 277
284 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { 278 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const {
285 return gfx::Image(); 279 return gfx::Image();
286 } 280 }
287 281
288 } // namespace shell 282 } // namespace shell
289 } // namespace ash 283 } // 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