| 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/session/session_state_delegate.h" | 8 #include "ash/common/session/session_state_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" |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 | 212 |
| 213 std::unique_ptr<ContainerDelegate> ShellDelegateMus::CreateContainerDelegate() { | 213 std::unique_ptr<ContainerDelegate> ShellDelegateMus::CreateContainerDelegate() { |
| 214 return base::WrapUnique(new ContainerDelegateMus); | 214 return base::WrapUnique(new ContainerDelegateMus); |
| 215 } | 215 } |
| 216 | 216 |
| 217 std::unique_ptr<PointerWatcherDelegate> | 217 std::unique_ptr<PointerWatcherDelegate> |
| 218 ShellDelegateMus::CreatePointerWatcherDelegate() { | 218 ShellDelegateMus::CreatePointerWatcherDelegate() { |
| 219 return base::WrapUnique(new PointerWatcherDelegateMus); | 219 return base::WrapUnique(new PointerWatcherDelegateMus); |
| 220 } | 220 } |
| 221 | 221 |
| 222 ui::MenuModel* ShellDelegateMus::CreateContextMenu(ash::Shelf* shelf, | 222 ui::MenuModel* ShellDelegateMus::CreateContextMenu(WmShelf* wm_shelf, |
| 223 const ShelfItem* item) { | 223 const ShelfItem* item) { |
| 224 return new ContextMenuMus(shelf); | 224 return new ContextMenuMus(wm_shelf); |
| 225 } | 225 } |
| 226 | 226 |
| 227 GPUSupport* ShellDelegateMus::CreateGPUSupport() { | 227 GPUSupport* ShellDelegateMus::CreateGPUSupport() { |
| 228 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; | 228 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; |
| 229 return new GPUSupportStub(); | 229 return new GPUSupportStub(); |
| 230 } | 230 } |
| 231 | 231 |
| 232 base::string16 ShellDelegateMus::GetProductName() const { | 232 base::string16 ShellDelegateMus::GetProductName() const { |
| 233 NOTIMPLEMENTED(); | 233 NOTIMPLEMENTED(); |
| 234 return base::string16(); | 234 return base::string16(); |
| 235 } | 235 } |
| 236 | 236 |
| 237 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 237 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
| 238 NOTIMPLEMENTED(); | 238 NOTIMPLEMENTED(); |
| 239 return gfx::Image(); | 239 return gfx::Image(); |
| 240 } | 240 } |
| 241 | 241 |
| 242 } // namespace sysui | 242 } // namespace sysui |
| 243 } // namespace ash | 243 } // namespace ash |
| OLD | NEW |