| 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 <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/common/gpu_support_stub.h" | 9 #include "ash/common/gpu_support_stub.h" |
| 10 #include "ash/common/media_delegate.h" | 10 #include "ash/common/media_delegate.h" |
| 11 #include "ash/common/palette_delegate.h" |
| 11 #include "ash/common/pointer_watcher_delegate.h" | 12 #include "ash/common/pointer_watcher_delegate.h" |
| 12 #include "ash/common/session/session_state_delegate.h" | 13 #include "ash/common/session/session_state_delegate.h" |
| 13 #include "ash/common/system/tray/default_system_tray_delegate.h" | 14 #include "ash/common/system/tray/default_system_tray_delegate.h" |
| 14 #include "ash/mus/accessibility_delegate_mus.h" | 15 #include "ash/mus/accessibility_delegate_mus.h" |
| 15 #include "ash/mus/new_window_delegate_mus.h" | 16 #include "ash/mus/new_window_delegate_mus.h" |
| 16 #include "base/memory/ptr_util.h" | 17 #include "base/memory/ptr_util.h" |
| 17 #include "base/strings/string16.h" | 18 #include "base/strings/string16.h" |
| 18 #include "components/user_manager/user_info_impl.h" | 19 #include "components/user_manager/user_info_impl.h" |
| 19 #include "ui/app_list/presenter/app_list_presenter.h" | 20 #include "ui/app_list/presenter/app_list_presenter.h" |
| 20 #include "ui/gfx/image/image.h" | 21 #include "ui/gfx/image/image.h" |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 | 190 |
| 190 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() { | 191 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() { |
| 191 return new mus::NewWindowDelegateMus; | 192 return new mus::NewWindowDelegateMus; |
| 192 } | 193 } |
| 193 | 194 |
| 194 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { | 195 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { |
| 195 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; | 196 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; |
| 196 return new MediaDelegateStub; | 197 return new MediaDelegateStub; |
| 197 } | 198 } |
| 198 | 199 |
| 200 std::unique_ptr<PaletteDelegate> ShellDelegateMus::CreatePaletteDelegate() { |
| 201 NOTIMPLEMENTED(); |
| 202 return nullptr; |
| 203 } |
| 204 |
| 199 std::unique_ptr<PointerWatcherDelegate> | 205 std::unique_ptr<PointerWatcherDelegate> |
| 200 ShellDelegateMus::CreatePointerWatcherDelegate() { | 206 ShellDelegateMus::CreatePointerWatcherDelegate() { |
| 201 NOTIMPLEMENTED(); | 207 NOTIMPLEMENTED(); |
| 202 return nullptr; | 208 return nullptr; |
| 203 } | 209 } |
| 204 | 210 |
| 205 ui::MenuModel* ShellDelegateMus::CreateContextMenu(WmShelf* wm_shelf, | 211 ui::MenuModel* ShellDelegateMus::CreateContextMenu(WmShelf* wm_shelf, |
| 206 const ShelfItem* item) { | 212 const ShelfItem* item) { |
| 207 NOTIMPLEMENTED(); | 213 NOTIMPLEMENTED(); |
| 208 return nullptr; | 214 return nullptr; |
| 209 } | 215 } |
| 210 | 216 |
| 211 GPUSupport* ShellDelegateMus::CreateGPUSupport() { | 217 GPUSupport* ShellDelegateMus::CreateGPUSupport() { |
| 212 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; | 218 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; |
| 213 return new GPUSupportStub(); | 219 return new GPUSupportStub(); |
| 214 } | 220 } |
| 215 | 221 |
| 216 base::string16 ShellDelegateMus::GetProductName() const { | 222 base::string16 ShellDelegateMus::GetProductName() const { |
| 217 NOTIMPLEMENTED(); | 223 NOTIMPLEMENTED(); |
| 218 return base::string16(); | 224 return base::string16(); |
| 219 } | 225 } |
| 220 | 226 |
| 221 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 227 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
| 222 NOTIMPLEMENTED(); | 228 NOTIMPLEMENTED(); |
| 223 return gfx::Image(); | 229 return gfx::Image(); |
| 224 } | 230 } |
| 225 | 231 |
| 226 } // namespace ash | 232 } // namespace ash |
| OLD | NEW |