Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(245)

Side by Side Diff: ash/sysui/shell_delegate_mus.cc

Issue 2046843005: mash: Migrate shelf menus to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ash_shell_with_content Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/sysui/shell_delegate_mus.h ('k') | ash/test/shelf_test_api.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
OLDNEW
« no previous file with comments | « ash/sysui/shell_delegate_mus.h ('k') | ash/test/shelf_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698