| 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/app_list_presenter_mus.h" | 11 #include "ash/mus/app_list_presenter_mus.h" |
| 12 #include "ash/mus/container_delegate_mus.h" |
| 12 #include "ash/mus/context_menu_mus.h" | 13 #include "ash/mus/context_menu_mus.h" |
| 13 #include "ash/mus/pointer_watcher_delegate_mus.h" | 14 #include "ash/mus/pointer_watcher_delegate_mus.h" |
| 14 #include "ash/mus/shelf_delegate_mus.h" | 15 #include "ash/mus/shelf_delegate_mus.h" |
| 15 #include "ash/session/session_state_delegate.h" | 16 #include "ash/session/session_state_delegate.h" |
| 16 #include "ash/system/tray/default_system_tray_delegate.h" | 17 #include "ash/system/tray/default_system_tray_delegate.h" |
| 17 #include "base/memory/ptr_util.h" | 18 #include "base/memory/ptr_util.h" |
| 18 #include "base/strings/string16.h" | 19 #include "base/strings/string16.h" |
| 19 #include "components/user_manager/user_info_impl.h" | 20 #include "components/user_manager/user_info_impl.h" |
| 20 #include "ui/app_list/presenter/app_list_presenter.h" | 21 #include "ui/app_list/presenter/app_list_presenter.h" |
| 21 #include "ui/gfx/image/image.h" | 22 #include "ui/gfx/image/image.h" |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() { | 202 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() { |
| 202 NOTIMPLEMENTED(); | 203 NOTIMPLEMENTED(); |
| 203 return nullptr; | 204 return nullptr; |
| 204 } | 205 } |
| 205 | 206 |
| 206 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { | 207 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { |
| 207 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; | 208 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; |
| 208 return new MediaDelegateStub; | 209 return new MediaDelegateStub; |
| 209 } | 210 } |
| 210 | 211 |
| 212 std::unique_ptr<ContainerDelegate> ShellDelegateMus::CreateContainerDelegate() { |
| 213 return base::WrapUnique(new ContainerDelegateMus); |
| 214 } |
| 215 |
| 211 std::unique_ptr<PointerWatcherDelegate> | 216 std::unique_ptr<PointerWatcherDelegate> |
| 212 ShellDelegateMus::CreatePointerWatcherDelegate() { | 217 ShellDelegateMus::CreatePointerWatcherDelegate() { |
| 213 return base::WrapUnique(new PointerWatcherDelegateMus); | 218 return base::WrapUnique(new PointerWatcherDelegateMus); |
| 214 } | 219 } |
| 215 | 220 |
| 216 ui::MenuModel* ShellDelegateMus::CreateContextMenu(ash::Shelf* shelf, | 221 ui::MenuModel* ShellDelegateMus::CreateContextMenu(ash::Shelf* shelf, |
| 217 const ShelfItem* item) { | 222 const ShelfItem* item) { |
| 218 return new ContextMenuMus(shelf); | 223 return new ContextMenuMus(shelf); |
| 219 } | 224 } |
| 220 | 225 |
| 221 GPUSupport* ShellDelegateMus::CreateGPUSupport() { | 226 GPUSupport* ShellDelegateMus::CreateGPUSupport() { |
| 222 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; | 227 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; |
| 223 return new GPUSupportStub(); | 228 return new GPUSupportStub(); |
| 224 } | 229 } |
| 225 | 230 |
| 226 base::string16 ShellDelegateMus::GetProductName() const { | 231 base::string16 ShellDelegateMus::GetProductName() const { |
| 227 NOTIMPLEMENTED(); | 232 NOTIMPLEMENTED(); |
| 228 return base::string16(); | 233 return base::string16(); |
| 229 } | 234 } |
| 230 | 235 |
| 231 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 236 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
| 232 NOTIMPLEMENTED(); | 237 NOTIMPLEMENTED(); |
| 233 return gfx::Image(); | 238 return gfx::Image(); |
| 234 } | 239 } |
| 235 | 240 |
| 236 } // namespace sysui | 241 } // namespace sysui |
| 237 } // namespace ash | 242 } // namespace ash |
| OLD | NEW |