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

Side by Side Diff: ash/shell/shell_delegate_impl.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/shell/shell_delegate_impl.h ('k') | ash/shell_delegate.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/shell/shell_delegate_impl.h" 5 #include "ash/shell/shell_delegate_impl.h"
6 6
7 #include "ash/app_list/app_list_presenter_delegate_factory.h" 7 #include "ash/app_list/app_list_presenter_delegate_factory.h"
8 #include "ash/common/accessibility_delegate.h" 8 #include "ash/common/accessibility_delegate.h"
9 #include "ash/common/default_accessibility_delegate.h" 9 #include "ash/common/default_accessibility_delegate.h"
10 #include "ash/common/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 std::unique_ptr<ash::ContainerDelegate> 259 std::unique_ptr<ash::ContainerDelegate>
260 ShellDelegateImpl::CreateContainerDelegate() { 260 ShellDelegateImpl::CreateContainerDelegate() {
261 return base::WrapUnique(new ContainerDelegateAura); 261 return base::WrapUnique(new ContainerDelegateAura);
262 } 262 }
263 263
264 std::unique_ptr<ash::PointerWatcherDelegate> 264 std::unique_ptr<ash::PointerWatcherDelegate>
265 ShellDelegateImpl::CreatePointerWatcherDelegate() { 265 ShellDelegateImpl::CreatePointerWatcherDelegate() {
266 return base::WrapUnique(new PointerWatcherDelegateAura); 266 return base::WrapUnique(new PointerWatcherDelegateAura);
267 } 267 }
268 268
269 ui::MenuModel* ShellDelegateImpl::CreateContextMenu( 269 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(WmShelf* wm_shelf,
270 ash::Shelf* shelf, 270 const ShelfItem* item) {
271 const ash::ShelfItem* item) { 271 return new ContextMenu(wm_shelf);
272 return new ContextMenu(shelf);
273 } 272 }
274 273
275 GPUSupport* ShellDelegateImpl::CreateGPUSupport() { 274 GPUSupport* ShellDelegateImpl::CreateGPUSupport() {
276 // Real GPU support depends on src/content, so just use a stub. 275 // Real GPU support depends on src/content, so just use a stub.
277 return new GPUSupportStub; 276 return new GPUSupportStub;
278 } 277 }
279 278
280 base::string16 ShellDelegateImpl::GetProductName() const { 279 base::string16 ShellDelegateImpl::GetProductName() const {
281 return base::string16(); 280 return base::string16();
282 } 281 }
283 282
284 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { 283 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const {
285 return gfx::Image(); 284 return gfx::Image();
286 } 285 }
287 286
288 } // namespace shell 287 } // namespace shell
289 } // namespace ash 288 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/shell_delegate_impl.h ('k') | ash/shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698