Merge Chromium at r12.0.742.93: Initial merge by git

Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6

1 files changed, 10 insertions, 1 deletions

diff --git a/webkit/glue/context_menu.h b/webkit/glue/context_menu.h
index 2f38807..e8441e5 100644
--- a/webkit/glue/context_menu.h
+++ b/webkit/glue/context_menu.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -19,6 +19,11 @@ namespace webkit_glue {
 struct CustomContextMenuContext {
   bool is_pepper_menu;
   int request_id;
+  // The routing ID of the render widget on which the context menu is shown.
+  // It could also be |kCurrentRenderWidget|, which means the render widget that
+  // the corresponding ViewHostMsg_ContextMenu is sent to.
+  int32 render_widget_id;
+  static const int32 kCurrentRenderWidget;
 
   CustomContextMenuContext();
 };
@@ -64,6 +69,10 @@ struct ContextMenuParams {
   // This is the URL of the subframe that the context menu was invoked on.
   GURL frame_url;
 
+  // This is the history item state of the subframe that the context menu was
+  // invoked on.
+  std::string frame_content_state;
+
   // These are the parameters for the media element that the context menu
   // was invoked on.
   int media_flags;