FIXUP: Fixup select elementsv5.10.0-rc3v5.10.0-rc2v5.10.0

Change-Id: I19e348aa999b5b3c7b44008c1d351e40b2557a3f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 8 insertions, 6 deletions

diff --git a/chromium/content/browser/browser_plugin/browser_plugin_guest.cc b/chromium/content/browser/browser_plugin/browser_plugin_guest.cc
index d03f0a8f2fc..579fbcad8e2 100644
--- a/chromium/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/chromium/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -53,7 +53,7 @@
 #include "ui/events/blink/web_input_event_traits.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
-#if defined(OS_MACOSX) && defined(USE_EXTERNAL_POPUP_MENU)
+#if defined(OS_MACOSX) && BUILDFLAG(USE_EXTERNAL_POPUP_MENU)
 #include "content/browser/browser_plugin/browser_plugin_popup_menu_helper_mac.h"
 #include "content/common/frame_messages.h"
 #endif
@@ -778,7 +778,7 @@ bool BrowserPluginGuest::OnMessageReceived(const IPC::Message& message,
   // around the whole thing (unfortunate but temporary), and #if guards where
   // they belong, only around the one IPC handler. TODO(avi): Move more of the
   // frame-based handlers to this function and remove the outer #if layer.
-#if defined(OS_MACOSX) && defined(USE_EXTERNAL_POPUP_MENU)
+#if defined(OS_MACOSX) && BUILDFLAG(USE_EXTERNAL_POPUP_MENU)
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(BrowserPluginGuest, message,
                                    render_frame_host)
@@ -1064,7 +1064,7 @@ void BrowserPluginGuest::OnHasTouchEventHandlers(bool accept) {
           browser_plugin_instance_id(), accept));
 }
 
-#if defined(OS_MACOSX) && defined(USE_EXTERNAL_POPUP_MENU)
+#if defined(OS_MACOSX) && BUILDFLAG(USE_EXTERNAL_POPUP_MENU)
 void BrowserPluginGuest::OnShowPopup(
     RenderFrameHost* render_frame_host,
     const FrameHostMsg_ShowPopup_Params& params) {
diff --git a/chromium/content/browser/browser_plugin/browser_plugin_guest.h b/chromium/content/browser/browser_plugin/browser_plugin_guest.h
index 2a8fb50c00c..17bce870818 100644
--- a/chromium/content/browser/browser_plugin/browser_plugin_guest.h
+++ b/chromium/content/browser/browser_plugin/browser_plugin_guest.h
@@ -30,6 +30,7 @@
 #include "base/values.h"
 #include "build/build_config.h"
 #include "content/common/edit_command.h"
+#include "content/common/features.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "content/public/browser/browser_plugin_guest_delegate.h"
 #include "content/public/browser/guest_host.h"
@@ -47,7 +48,7 @@
 struct BrowserPluginHostMsg_Attach_Params;
 struct BrowserPluginHostMsg_SetComposition_Params;
 
-#if defined(OS_MACOSX) && defined(USE_EXTERNAL_POPUP_MENU)
+#if defined(OS_MACOSX) && BUILDFLAG(USE_EXTERNAL_POPUP_MENU)
 struct FrameHostMsg_ShowPopup_Params;
 #endif
 
@@ -356,7 +357,7 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
       blink::WebInputEvent::Type event_type,
       InputEventAckState ack_result);
   void OnHasTouchEventHandlers(bool accept);
-#if defined(OS_MACOSX) && defined(USE_EXTERNAL_POPUP_MENU)
+#if defined(OS_MACOSX) && BUILDFLAG(USE_EXTERNAL_POPUP_MENU)
   // On MacOS X popups are painted by the browser process. We handle them here
   // so that they are positioned correctly.
   void OnShowPopup(RenderFrameHost* render_frame_host,
diff --git a/chromium/content/browser/frame_host/popup_menu_helper_mac.mm b/chromium/content/browser/frame_host/popup_menu_helper_mac.mm
index c10dce2e427..d033650664e 100644
--- a/chromium/content/browser/frame_host/popup_menu_helper_mac.mm
+++ b/chromium/content/browser/frame_host/popup_menu_helper_mac.mm
@@ -13,6 +13,7 @@
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
 #include "content/browser/renderer_host/webmenurunner_mac.h"
+#include "content/common/features.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
@@ -104,7 +105,7 @@ void PopupMenuHelper::ShowPopupMenu(
 
   menu_runner_ = nil;
 
-#if defined(USE_EXTERNAL_POPUP_MENU)
+#if BUILDFLAG(USE_EXTERNAL_POPUP_MENU)
   // The RenderFrameHost may be deleted while running the menu, or it may have
   // requested the close. Don't notify in these cases.
   if (render_frame_host_ && !popup_was_hidden_) {