chrome/browser/ui/ash/launcher/launcher_context_menu.h - Issue 10984034: Revert 158691 - Give platform apps control over launcher right-click context menu.

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/launcher/launcher_context_menu.h

Issue 10984034: Revert 158691 - Give platform apps control over launcher right-click context menu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/launcher_context_menu.h

===================================================================

--- chrome/browser/ui/ash/launcher/launcher_context_menu.h (revision 158704)

+++ chrome/browser/ui/ash/launcher/launcher_context_menu.h (working copy)

@@ -8,15 +8,10 @@

#include "ash/launcher/launcher_alignment_menu.h"

#include "ash/launcher/launcher_types.h"

#include "base/basictypes.h"

-#include "base/memory/scoped_ptr.h"

#include "ui/base/models/simple_menu_model.h"

class ChromeLauncherController;

-namespace extensions {

-class ContextMenuMatcher;

// Context menu shown for a launcher item.

class LauncherContextMenu : public ui::SimpleMenuModel,

public ui::SimpleMenuModel::Delegate {

@@ -63,8 +58,6 @@

ash::LauncherAlignmentMenu alignment_menu_;

- scoped_ptr<extensions::ContextMenuMatcher> extension_items_;

DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu);

};