2 files changed, 6 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index e3600cd..7083247 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -85,6 +85,7 @@ using WebKit::WebPlugin;
 using WebKit::WebPluginParams;
 using WebKit::WebPoint;
 using WebKit::WebPopupMenu;
+using WebKit::WebPopupType;
 using WebKit::WebRange;
 using WebKit::WebRect;
 using WebKit::WebScreenInfo;
@@ -300,9 +301,9 @@ WebView* TestWebViewDelegate::createView(WebFrame* creator) {
   return shell_->CreateWebView();
 }
 
-WebWidget* TestWebViewDelegate::createPopupMenu(
-    bool activatable) {
-  // TODO(darin): Should we honor activatable?
+WebWidget* TestWebViewDelegate::createPopupMenu(WebPopupType popup_type) {
+  // TODO(darin): Should we take into account |popup_type| (for activation
+  //              purpose)?
   return shell_->CreatePopupWidget();
 }
 
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index cfdabe0..ad42917b 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -32,6 +32,7 @@
 #if defined(OS_MACOSX)
 #include "third_party/WebKit/WebKit/chromium/public/WebPopupMenuInfo.h"
 #endif
+#include "third_party/WebKit/WebKit/chromium/public/WebPopupType.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/plugins/webplugin_page_delegate.h"
@@ -74,7 +75,7 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
 
   // WebKit::WebViewClient
   virtual WebKit::WebView* createView(WebKit::WebFrame* creator);
-  virtual WebKit::WebWidget* createPopupMenu(bool activatable);
+  virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType popup_type);
   virtual WebKit::WebWidget* createPopupMenu(
       const WebKit::WebPopupMenuInfo& info);
   virtual WebKit::WebStorageNamespace* createSessionStorageNamespace();