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

content/renderer/external_popup_menu.cc

 // Copyright (c) 2012 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.
 
 #include "content/renderer/external_popup_menu.h"
 
 #include <stddef.h>
 
 #include "build/build_config.h"
 #include "content/common/frame_messages.h"
@@ skipping 45 matching lines @@
       new FrameHostMsg_ShowPopup(render_frame_->GetRoutingID(), popup_params));
 }
 
 void ExternalPopupMenu::close()  {
   render_frame_->Send(
       new FrameHostMsg_HidePopup(render_frame_->GetRoutingID()));
   render_frame_->DidHideExternalPopupMenu();
   // |this| was deleted.
 }
 
+#if defined(USE_EXTERNAL_POPUP_MENU)
 #if defined(OS_MACOSX)
 void ExternalPopupMenu::DidSelectItem(int index) {
   if (!popup_menu_client_)
     return;
   if (index == -1)
     popup_menu_client_->didCancel();
   else
     popup_menu_client_->didAcceptIndex(index);
 }
-#endif
-
-#if defined(OS_ANDROID)
+#else
 void ExternalPopupMenu::DidSelectItems(bool canceled,
                                        const std::vector<int>& indices) {
   if (!popup_menu_client_)
     return;
   if (canceled)
     popup_menu_client_->didCancel();
   else
     popup_menu_client_->didAcceptIndices(indices);
 }
 #endif
+#endif
 
 }  // namespace content