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" |
15 #include "base/strings/string16.h" | 16 #include "base/strings/string16.h" |
16 #include "components/user_manager/user_info_impl.h" | 17 #include "components/user_manager/user_info_impl.h" |
17 #include "ui/app_list/presenter/app_list_presenter.h" | 18 #include "ui/app_list/presenter/app_list_presenter.h" |
18 #include "ui/gfx/image/image.h" | 19 #include "ui/gfx/image/image.h" |
19 | 20 |
20 namespace ash { | 21 namespace ash { |
21 namespace sysui { | 22 namespace sysui { |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() { | 219 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() { |
219 NOTIMPLEMENTED(); | 220 NOTIMPLEMENTED(); |
220 return nullptr; | 221 return nullptr; |
221 } | 222 } |
222 | 223 |
223 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { | 224 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { |
224 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; | 225 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; |
225 return new MediaDelegateStub; | 226 return new MediaDelegateStub; |
226 } | 227 } |
227 | 228 |
| 229 PointerWatcherDelegate* ShellDelegateMus::CreatePointerWatcherDelegate() { |
| 230 return new PointerWatcherDelegateMus; |
| 231 } |
| 232 |
228 ui::MenuModel* ShellDelegateMus::CreateContextMenu(ash::Shelf* shelf, | 233 ui::MenuModel* ShellDelegateMus::CreateContextMenu(ash::Shelf* shelf, |
229 const ShelfItem* item) { | 234 const ShelfItem* item) { |
230 return new ContextMenuMus(shelf); | 235 return new ContextMenuMus(shelf); |
231 } | 236 } |
232 | 237 |
233 GPUSupport* ShellDelegateMus::CreateGPUSupport() { | 238 GPUSupport* ShellDelegateMus::CreateGPUSupport() { |
234 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; | 239 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; |
235 return new GPUSupportStub(); | 240 return new GPUSupportStub(); |
236 } | 241 } |
237 | 242 |
238 base::string16 ShellDelegateMus::GetProductName() const { | 243 base::string16 ShellDelegateMus::GetProductName() const { |
239 NOTIMPLEMENTED(); | 244 NOTIMPLEMENTED(); |
240 return base::string16(); | 245 return base::string16(); |
241 } | 246 } |
242 | 247 |
243 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 248 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
244 NOTIMPLEMENTED(); | 249 NOTIMPLEMENTED(); |
245 return gfx::Image(); | 250 return gfx::Image(); |
246 } | 251 } |
247 | 252 |
248 } // namespace sysui | 253 } // namespace sysui |
249 } // namespace ash | 254 } // namespace ash |
OLD | NEW |