chrome/browser/tab_contents/render_view_context_menu.h - Issue 9382037: Move ContextMenuParams struct from webkit/glue to content/public/common. The reasons are:

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/tab_contents/render_view_context_menu.h

Issue 9382037: Move ContextMenuParams struct from webkit/glue to content/public/common. The reasons are: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix mac Created 8 years, 10 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/tab_contents/chrome_web_contents_view_mac_delegate.mm ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | content/public/common/context_menu_params.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/tab_contents/render_view_context_menu.h

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

--- chrome/browser/tab_contents/render_view_context_menu.h (revision 121660)

+++ chrome/browser/tab_contents/render_view_context_menu.h (working copy)

@@ -17,9 +17,9 @@

#include "chrome/browser/custom_handlers/protocol_handler_registry.h"

#include "chrome/browser/extensions/extension_menu_manager.h"

#include "chrome/browser/tab_contents/render_view_context_menu_observer.h"

+#include "content/public/common/context_menu_params.h"

#include "content/public/common/page_transition_types.h"

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

-#include "webkit/glue/context_menu.h"

#include "webkit/glue/window_open_disposition.h"

class ExtensionMenuItem;

@@ -122,7 +122,7 @@

static const size_t kMaxSelectionTextLength;

RenderViewContextMenu(content::WebContents* web_contents,

- const ContextMenuParams& params);

+ const content::ContextMenuParams& params);

virtual ~RenderViewContextMenu();

@@ -166,7 +166,7 @@

// Attempts to get an ExtensionMenuItem given the id of a context menu item.

ExtensionMenuItem* GetExtensionMenuItem(int id) const;

- ContextMenuParams params_;

+ content::ContextMenuParams params_;

content::WebContents* source_web_contents_;

Profile* profile_;

@@ -186,12 +186,12 @@

static bool IsDevToolsURL(const GURL& url);

static bool IsInternalResourcesURL(const GURL& url);

static bool ExtensionContextAndPatternMatch(

- const ContextMenuParams& params,

+ const content::ContextMenuParams& params,

ExtensionMenuItem::ContextList contexts,

const URLPatternSet& target_url_patterns);

static ExtensionMenuItem::List GetRelevantExtensionItems(

const ExtensionMenuItem::List& items,

- const ContextMenuParams& params,

+ const content::ContextMenuParams& params,

Profile* profile,

bool can_cross_incognito);