OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/mus/shell_delegate_mus.h" | 5 #include "ash/mus/shell_delegate_mus.h" |
6 | 6 |
7 #include "ash/default_accessibility_delegate.h" | 7 #include "ash/default_accessibility_delegate.h" |
8 #include "ash/default_user_wallpaper_delegate.h" | 8 #include "ash/default_user_wallpaper_delegate.h" |
9 #include "ash/gpu_support_stub.h" | 9 #include "ash/gpu_support_stub.h" |
10 #include "ash/media_delegate.h" | 10 #include "ash/media_delegate.h" |
11 #include "ash/mus/context_menu_mus.h" | 11 #include "ash/mus/context_menu_mus.h" |
| 12 #include "ash/mus/pointer_watcher_delegate_mus.h" |
12 #include "ash/mus/shelf_delegate_mus.h" | 13 #include "ash/mus/shelf_delegate_mus.h" |
13 #include "ash/session/session_state_delegate.h" | 14 #include "ash/session/session_state_delegate.h" |
14 #include "ash/system/tray/default_system_tray_delegate.h" | 15 #include "ash/system/tray/default_system_tray_delegate.h" |
| 16 #include "base/memory/ptr_util.h" |
15 #include "base/strings/string16.h" | 17 #include "base/strings/string16.h" |
16 #include "components/user_manager/user_info_impl.h" | 18 #include "components/user_manager/user_info_impl.h" |
17 #include "ui/app_list/presenter/app_list_presenter.h" | 19 #include "ui/app_list/presenter/app_list_presenter.h" |
18 #include "ui/gfx/image/image.h" | 20 #include "ui/gfx/image/image.h" |
19 | 21 |
20 namespace ash { | 22 namespace ash { |
21 namespace sysui { | 23 namespace sysui { |
22 | 24 |
23 namespace { | 25 namespace { |
24 | 26 |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() { | 220 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() { |
219 NOTIMPLEMENTED(); | 221 NOTIMPLEMENTED(); |
220 return nullptr; | 222 return nullptr; |
221 } | 223 } |
222 | 224 |
223 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { | 225 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { |
224 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; | 226 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; |
225 return new MediaDelegateStub; | 227 return new MediaDelegateStub; |
226 } | 228 } |
227 | 229 |
| 230 std::unique_ptr<PointerWatcherDelegate> |
| 231 ShellDelegateMus::CreatePointerWatcherDelegate() { |
| 232 return base::WrapUnique(new PointerWatcherDelegateMus); |
| 233 } |
| 234 |
228 ui::MenuModel* ShellDelegateMus::CreateContextMenu(ash::Shelf* shelf, | 235 ui::MenuModel* ShellDelegateMus::CreateContextMenu(ash::Shelf* shelf, |
229 const ShelfItem* item) { | 236 const ShelfItem* item) { |
230 return new ContextMenuMus(shelf); | 237 return new ContextMenuMus(shelf); |
231 } | 238 } |
232 | 239 |
233 GPUSupport* ShellDelegateMus::CreateGPUSupport() { | 240 GPUSupport* ShellDelegateMus::CreateGPUSupport() { |
234 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; | 241 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; |
235 return new GPUSupportStub(); | 242 return new GPUSupportStub(); |
236 } | 243 } |
237 | 244 |
238 base::string16 ShellDelegateMus::GetProductName() const { | 245 base::string16 ShellDelegateMus::GetProductName() const { |
239 NOTIMPLEMENTED(); | 246 NOTIMPLEMENTED(); |
240 return base::string16(); | 247 return base::string16(); |
241 } | 248 } |
242 | 249 |
243 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 250 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
244 NOTIMPLEMENTED(); | 251 NOTIMPLEMENTED(); |
245 return gfx::Image(); | 252 return gfx::Image(); |
246 } | 253 } |
247 | 254 |
248 } // namespace sysui | 255 } // namespace sysui |
249 } // namespace ash | 256 } // namespace ash |
OLD | NEW |