Enable external popup menu in Blimp, part 1/2.

content/renderer/external_popup_menu.h

Index: content/renderer/external_popup_menu.h
diff --git a/content/renderer/external_popup_menu.h b/content/renderer/external_popup_menu.h
index 0d99eb7e6d97ba40aa97e5a4f7bcde6b02434262..0158f99fc0d9d9f34d496ec775ab32f5c6d4577b 100644
--- a/content/renderer/external_popup_menu.h
+++ b/content/renderer/external_popup_menu.h
@@ -31,16 +31,16 @@ class ExternalPopupMenu : public blink::WebExternalPopupMenu {
   void SetOriginScaleAndOffsetForEmulation(
       float scale, const gfx::PointF& offset);
 
+#if defined(USE_EXTERNAL_POPUP_MENU)
 #if defined(OS_MACOSX)
   // Called when the user has selected an item. |selected_item| is -1 if the
   // user canceled the popup.
   void DidSelectItem(int selected_index);
-#endif
-
-#if defined(OS_ANDROID)
+#else
   // Called when the user has selected items or canceled the popup.
   void DidSelectItems(bool canceled, const std::vector<int>& selected_indices);
 #endif
+#endif
 
   // blink::WebExternalPopupMenu implementation:
   void show(const blink::WebRect& bounds) override;