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

content/renderer/render_frame_impl.h

Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 3ddbf72d8c089821d021833c62ee879a7294abe3..9f2c58417ade23d3693ec2f5df9de74c2bb03dad 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -364,7 +364,7 @@ class CONTENT_EXPORT RenderFrameImpl
   // NULL.
   MediaStreamDispatcher* GetMediaStreamDispatcher();
 
-#if defined(OS_MACOSX) || defined(OS_ANDROID)
+#if defined(USE_EXTERNAL_POPUP_MENU)
   void DidHideExternalPopupMenu();
 #endif
 
@@ -819,6 +819,9 @@ class CONTENT_EXPORT RenderFrameImpl
 #if defined(OS_ANDROID)
   void OnActivateNearestFindResult(int request_id, float x, float y);
   void OnFindMatchRects(int current_version);
+#endif
+
+#if defined(USE_EXTERNAL_POPUP_MENU) && !defined(OS_MACOSX)

[Wez, 2016/05/27 02:24:51]

nit: This might read more clearly as a nested #if, since USE_EXTERNAL_POPUP_MENU
is used on Mac, right?

[haibinlu, 2016/05/28 01:37:59]

Done.

   void OnSelectPopupMenuItems(bool canceled,
                               const std::vector<int>& selected_indices);
 #elif defined(OS_MACOSX)
@@ -1214,7 +1217,7 @@ class CONTENT_EXPORT RenderFrameImpl
   // stack that interferes with swapping out.
   bool suppress_further_dialogs_;
 
-#if defined(OS_MACOSX) || defined(OS_ANDROID)
+#if defined(USE_EXTERNAL_POPUP_MENU)
   // The external popup for the currently showing select popup.
   std::unique_ptr<ExternalPopupMenu> external_popup_menu_;
 #endif