2 files changed, 11 insertions, 3 deletions
diff --git a/webkit/glue/context_menu.cc b/webkit/glue/context_menu.cc
index b4f479c..317130e 100644
--- a/webkit/glue/context_menu.cc
+++ b/webkit/glue/context_menu.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -7,9 +7,12 @@
 
 namespace webkit_glue {
 
+const int32 CustomContextMenuContext::kCurrentRenderWidget = kint32max;
+
 CustomContextMenuContext::CustomContextMenuContext()
     : is_pepper_menu(false),
-      request_id(0) {
+      request_id(0),
+      render_widget_id(kCurrentRenderWidget) {
 }
 
 }  // namespace webkit_glue
diff --git a/webkit/glue/context_menu.h b/webkit/glue/context_menu.h
index 45a91e8..e8441e56 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();
 };