| 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/sysui/shell_delegate_mus.h" | 5 #include "ash/sysui/shell_delegate_mus.h" |
| 6 | 6 |
| 7 #include "ash/common/default_accessibility_delegate.h" | 7 #include "ash/common/default_accessibility_delegate.h" |
| 8 #include "ash/common/gpu_support_stub.h" | 8 #include "ash/common/gpu_support_stub.h" |
| 9 #include "ash/common/media_delegate.h" | 9 #include "ash/common/media_delegate.h" |
| 10 #include "ash/common/palette_delegate.h" | 10 #include "ash/common/palette_delegate.h" |
| 11 #include "ash/common/session/session_state_delegate.h" | 11 #include "ash/common/session/session_state_delegate.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/sysui/app_list_presenter_mus.h" | 13 #include "ash/sysui/app_list_presenter_mus.h" |
| 14 #include "ash/sysui/context_menu_mus.h" | 14 #include "ash/sysui/context_menu_mus.h" |
| 15 #include "ash/sysui/pointer_watcher_delegate_mus.h" | |
| 16 #include "ash/sysui/shelf_delegate_mus.h" | 15 #include "ash/sysui/shelf_delegate_mus.h" |
| 17 #include "ash/sysui/user_wallpaper_delegate_mus.h" | 16 #include "ash/sysui/user_wallpaper_delegate_mus.h" |
| 18 #include "base/memory/ptr_util.h" | 17 #include "base/memory/ptr_util.h" |
| 19 #include "base/strings/string16.h" | 18 #include "base/strings/string16.h" |
| 20 #include "components/user_manager/user_info_impl.h" | 19 #include "components/user_manager/user_info_impl.h" |
| 21 #include "ui/app_list/presenter/app_list_presenter.h" | 20 #include "ui/app_list/presenter/app_list_presenter.h" |
| 22 #include "ui/gfx/image/image.h" | 21 #include "ui/gfx/image/image.h" |
| 23 | 22 |
| 24 namespace ash { | 23 namespace ash { |
| 25 namespace sysui { | 24 namespace sysui { |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { | 193 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { |
| 195 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; | 194 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; |
| 196 return new MediaDelegateStub; | 195 return new MediaDelegateStub; |
| 197 } | 196 } |
| 198 | 197 |
| 199 std::unique_ptr<PaletteDelegate> ShellDelegateMus::CreatePaletteDelegate() { | 198 std::unique_ptr<PaletteDelegate> ShellDelegateMus::CreatePaletteDelegate() { |
| 200 NOTIMPLEMENTED(); | 199 NOTIMPLEMENTED(); |
| 201 return nullptr; | 200 return nullptr; |
| 202 } | 201 } |
| 203 | 202 |
| 204 std::unique_ptr<PointerWatcherDelegate> | |
| 205 ShellDelegateMus::CreatePointerWatcherDelegate() { | |
| 206 return base::WrapUnique(new PointerWatcherDelegateMus); | |
| 207 } | |
| 208 | |
| 209 ui::MenuModel* ShellDelegateMus::CreateContextMenu(WmShelf* wm_shelf, | 203 ui::MenuModel* ShellDelegateMus::CreateContextMenu(WmShelf* wm_shelf, |
| 210 const ShelfItem* item) { | 204 const ShelfItem* item) { |
| 211 return new ContextMenuMus(wm_shelf); | 205 return new ContextMenuMus(wm_shelf); |
| 212 } | 206 } |
| 213 | 207 |
| 214 GPUSupport* ShellDelegateMus::CreateGPUSupport() { | 208 GPUSupport* ShellDelegateMus::CreateGPUSupport() { |
| 215 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; | 209 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; |
| 216 return new GPUSupportStub(); | 210 return new GPUSupportStub(); |
| 217 } | 211 } |
| 218 | 212 |
| 219 base::string16 ShellDelegateMus::GetProductName() const { | 213 base::string16 ShellDelegateMus::GetProductName() const { |
| 220 NOTIMPLEMENTED(); | 214 NOTIMPLEMENTED(); |
| 221 return base::string16(); | 215 return base::string16(); |
| 222 } | 216 } |
| 223 | 217 |
| 224 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 218 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
| 225 NOTIMPLEMENTED(); | 219 NOTIMPLEMENTED(); |
| 226 return gfx::Image(); | 220 return gfx::Image(); |
| 227 } | 221 } |
| 228 | 222 |
| 229 } // namespace sysui | 223 } // namespace sysui |
| 230 } // namespace ash | 224 } // namespace ash |
| OLD | NEW |