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

Unified Diff: content/browser/renderer_host/render_view_host.cc

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
Index: content/browser/renderer_host/render_view_host.cc
===================================================================
--- content/browser/renderer_host/render_view_host.cc (revision 121660)
+++ content/browser/renderer_host/render_view_host.cc (working copy)
@@ -45,6 +45,7 @@
#include "content/public/browser/user_metrics.h"
#include "content/public/common/bindings_policy.h"
#include "content/public/common/content_constants.h"
+#include "content/public/common/context_menu_params.h"
#include "content/public/common/result_codes.h"
#include "content/public/common/url_constants.h"
#include "net/base/net_util.h"
@@ -52,7 +53,6 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/native_widget_types.h"
#include "webkit/fileapi/isolated_context.h"
-#include "webkit/glue/context_menu.h"
#include "webkit/glue/webaccessibility.h"
#include "webkit/glue/webdropdata.h"
@@ -1028,14 +1028,15 @@
delegate_->DocumentOnLoadCompletedInMainFrame(this, page_id);
}
-void RenderViewHost::OnMsgContextMenu(const ContextMenuParams& params) {
+void RenderViewHost::OnMsgContextMenu(
+ const content::ContextMenuParams& params) {
RenderViewHostDelegate::View* view = delegate_->GetViewDelegate();
if (!view)
return;
// Validate the URLs in |params|. If the renderer can't request the URLs
// directly, don't show them in the context menu.
- ContextMenuParams validated_params(params);
+ content::ContextMenuParams validated_params(params);
int renderer_id = process()->GetID();
ChildProcessSecurityPolicyImpl* policy =
ChildProcessSecurityPolicyImpl::GetInstance();
@@ -1397,12 +1398,12 @@
}
void RenderViewHost::ExecuteCustomContextMenuCommand(
- int action, const webkit_glue::CustomContextMenuContext& context) {
+ int action, const content::CustomContextMenuContext& context) {
Send(new ViewMsg_CustomContextMenuAction(routing_id(), context, action));
}
void RenderViewHost::NotifyContextMenuClosed(
- const webkit_glue::CustomContextMenuContext& context) {
+ const content::CustomContextMenuContext& context) {
Send(new ViewMsg_ContextMenuClosed(routing_id(), context));
}

Powered by Google App Engine
This is Rietveld 408576698