chrome/browser/ui/ash/chrome_shell_delegate.h - Issue 2046843005: mash: Migrate shelf menus to wm common types

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate.h

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:

Index: chrome/browser/ui/ash/chrome_shell_delegate.h

diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h

index faf50f844496f4c814d60c12ab1a98bbb8074759..fa4fe70014ce2a29cd90a9f3a9c0a483a3ace598 100644

--- a/chrome/browser/ui/ash/chrome_shell_delegate.h

+++ b/chrome/browser/ui/ash/chrome_shell_delegate.h

@@ -9,7 +9,6 @@

#include <string>

#include "ash/shell_delegate.h"

-#include "base/compiler_specific.h"

#include "base/macros.h"

#include "base/observer_list.h"

#include "build/build_config.h"

@@ -61,7 +60,7 @@ class ChromeShellDelegate : public ash::ShellDelegate,

std::unique_ptr<ash::ContainerDelegate> CreateContainerDelegate() override;

std::unique_ptr<ash::PointerWatcherDelegate> CreatePointerWatcherDelegate()

override;

- ui::MenuModel* CreateContextMenu(ash::Shelf* shelf,

+ ui::MenuModel* CreateContextMenu(ash::WmShelf* wm_shelf,

const ash::ShelfItem* item) override;

ash::GPUSupport* CreateGPUSupport() override;

base::string16 GetProductName() const override;

« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »