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

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

Issue 1921673005: mus: Add PointerWatcher for passively observing mouse and touch events (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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/app_list/app_list_view_delegate_factory.h" 9 #include "ash/app_list/app_list_view_delegate_factory.h"
10 #include "ash/default_accessibility_delegate.h" 10 #include "ash/default_accessibility_delegate.h"
11 #include "ash/default_user_wallpaper_delegate.h" 11 #include "ash/default_user_wallpaper_delegate.h"
12 #include "ash/gpu_support_stub.h" 12 #include "ash/gpu_support_stub.h"
13 #include "ash/media_delegate.h" 13 #include "ash/media_delegate.h"
14 #include "ash/new_window_delegate.h" 14 #include "ash/new_window_delegate.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"
19 #include "ash/shell/toplevel_window.h" 20 #include "ash/shell/toplevel_window.h"
20 #include "ash/shell_window_ids.h" 21 #include "ash/shell_window_ids.h"
21 #include "ash/system/tray/default_system_tray_delegate.h" 22 #include "ash/system/tray/default_system_tray_delegate.h"
22 #include "ash/test/test_keyboard_ui.h" 23 #include "ash/test/test_keyboard_ui.h"
23 #include "ash/wm/common/window_state.h" 24 #include "ash/wm/common/window_state.h"
24 #include "base/memory/ptr_util.h" 25 #include "base/memory/ptr_util.h"
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 } 247 }
247 248
248 ash::NewWindowDelegate* ShellDelegateImpl::CreateNewWindowDelegate() { 249 ash::NewWindowDelegate* ShellDelegateImpl::CreateNewWindowDelegate() {
249 return new NewWindowDelegateImpl; 250 return new NewWindowDelegateImpl;
250 } 251 }
251 252
252 ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() { 253 ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() {
253 return new MediaDelegateImpl; 254 return new MediaDelegateImpl;
254 } 255 }
255 256
257 std::unique_ptr<ash::PointerWatcherDelegate>
258 ShellDelegateImpl::CreatePointerWatcherDelegate() {
259 return base::WrapUnique(new PointerWatcherDelegateAura);
260 }
261
256 ui::MenuModel* ShellDelegateImpl::CreateContextMenu( 262 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(
257 ash::Shelf* shelf, 263 ash::Shelf* shelf,
258 const ash::ShelfItem* item) { 264 const ash::ShelfItem* item) {
259 return new ContextMenu(shelf); 265 return new ContextMenu(shelf);
260 } 266 }
261 267
262 GPUSupport* ShellDelegateImpl::CreateGPUSupport() { 268 GPUSupport* ShellDelegateImpl::CreateGPUSupport() {
263 // Real GPU support depends on src/content, so just use a stub. 269 // Real GPU support depends on src/content, so just use a stub.
264 return new GPUSupportStub; 270 return new GPUSupportStub;
265 } 271 }
266 272
267 base::string16 ShellDelegateImpl::GetProductName() const { 273 base::string16 ShellDelegateImpl::GetProductName() const {
268 return base::string16(); 274 return base::string16();
269 } 275 }
270 276
271 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { 277 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const {
272 return gfx::Image(); 278 return gfx::Image();
273 } 279 }
274 280
275 } // namespace shell 281 } // namespace shell
276 } // namespace ash 282 } // 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