Multi-select <select> in 'external popup window'

content/browser/web_contents/interstitial_page_impl.cc

Index: content/browser/web_contents/interstitial_page_impl.cc
diff --git a/content/browser/web_contents/interstitial_page_impl.cc b/content/browser/web_contents/interstitial_page_impl.cc
index 41b307ee6746eeb3237ab1c4c67ca25abf69ad40..f00d7dae861302534e0081e74b124d9eae5cc680 100644
--- a/content/browser/web_contents/interstitial_page_impl.cc
+++ b/content/browser/web_contents/interstitial_page_impl.cc
@@ -86,6 +86,27 @@ class InterstitialPageImpl::InterstitialPageRVHDelegateView
   explicit InterstitialPageRVHDelegateView(InterstitialPageImpl* page);
 
   // RenderViewHostDelegateView implementation:
+  virtual void CreateNewWindow(
+      int route_id,
+      const ViewHostMsg_CreateWindow_Params& params);
+  virtual void CreateNewWidget(int route_id,
+                               WebKit::WebPopupType popup_type);
+  virtual void CreateNewFullscreenWidget(int route_id);
+  virtual void ShowCreatedWindow(int route_id,
+                                 WindowOpenDisposition disposition,
+                                 const gfx::Rect& initial_pos,
+                                 bool user_gesture);
+  virtual void ShowCreatedWidget(int route_id,
+                                 const gfx::Rect& initial_pos);
+  virtual void ShowCreatedFullscreenWidget(int route_id);
+  virtual void ShowContextMenu(const content::ContextMenuParams& params);
+  virtual void ShowPopupMenu(const gfx::Rect& bounds,

[Avi (use Gerrit), 2012/05/24 18:41:41]

ShowPopupMenu was the only function you added to RenderViewHostDelegateView. Why
are you adding the rest of these functions here? It looks like a bad merge of a
change made to this file not long ago. Also, if this is an interface
implementation, use OVERRIDE everywhere. (It would have caught this mismerge.)

[aruslan, 2012/05/24 19:53:15]

Stupid me. Thanks!!
On 2012/05/24 18:41:41, Avi wrote:

+                             int item_height,
+                             double item_font_size,
+                             int selected_item,
+                             const std::vector<WebMenuItem>& items,
+                             bool right_aligned,
+                             bool allow_multiple_selection);
   virtual void StartDragging(const WebDropData& drop_data,
                              WebDragOperationsMask operations_allowed,
                              const SkBitmap& image,
@@ -692,6 +713,54 @@ InterstitialPageImpl::InterstitialPageRVHDelegateView::
     : interstitial_page_(page) {
 }
 
+void InterstitialPageImpl::InterstitialPageRVHDelegateView::CreateNewWindow(
+    int route_id,
+    const ViewHostMsg_CreateWindow_Params& params) {
+  NOTREACHED() << "InterstitialPage does not support showing popups yet.";
+}
+
+void InterstitialPageImpl::InterstitialPageRVHDelegateView::CreateNewWidget(
+    int route_id, WebKit::WebPopupType popup_type) {
+  NOTREACHED() << "InterstitialPage does not support showing drop-downs yet.";
+}
+
+void InterstitialPageImpl::InterstitialPageRVHDelegateView::
+    CreateNewFullscreenWidget(int route_id) {
+  NOTREACHED()
+      << "InterstitialPage does not support showing full screen popups.";
+}
+
+void InterstitialPageImpl::InterstitialPageRVHDelegateView::ShowCreatedWindow(
+    int route_id, WindowOpenDisposition disposition,
+    const gfx::Rect& initial_pos, bool user_gesture) {
+  NOTREACHED() << "InterstitialPage does not support showing popups yet.";
+}
+
+void InterstitialPageImpl::InterstitialPageRVHDelegateView::ShowCreatedWidget(
+    int route_id, const gfx::Rect& initial_pos) {
+  NOTREACHED() << "InterstitialPage does not support showing drop-downs yet.";
+}
+
+void InterstitialPageImpl::InterstitialPageRVHDelegateView::
+    ShowCreatedFullscreenWidget(int route_id) {
+  NOTREACHED()
+      << "InterstitialPage does not support showing full screen popups.";
+}
+
+void InterstitialPageImpl::InterstitialPageRVHDelegateView::ShowContextMenu(
+    const content::ContextMenuParams& params) {
+}

[Avi (use Gerrit), 2012/05/24 18:41:41]

Bad merge.

[aruslan, 2012/05/24 19:53:15]

Done.

+
+void InterstitialPageImpl::InterstitialPageRVHDelegateView::ShowPopupMenu(
+    const gfx::Rect& bounds,
+    int item_height,
+    double item_font_size,
+    int selected_item,
+    const std::vector<WebMenuItem>& items,
+    bool right_aligned,
+    bool allow_multiple_selection) {
+}
+
 void InterstitialPageImpl::InterstitialPageRVHDelegateView::StartDragging(
     const WebDropData& drop_data,
     WebDragOperationsMask allowed_operations,