Migrate to OS_MAC and OS_APPLE in content
Because content is not used by iOS, this migrates
defined(OS_MACOSX) -> defined(OS_MAC)
Bug: 1105907
Change-Id: Ibf85273fea9c5566594ca00f2589b890515be6c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2321210
Commit-Queue: Avi Drissman <[email protected]>
Reviewed-by: Nasko Oskov <[email protected]>
Reviewed-by: Robert Sesek <[email protected]>
Cr-Commit-Position: refs/heads/master@{#792842}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 12a1c9a..32b0006 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2786,7 +2786,7 @@
bool WebContentsImpl::HandleWheelEvent(
const blink::WebMouseWheelEvent& event) {
-#if !defined(OS_MACOSX)
+#if !defined(OS_MAC)
// On platforms other than Mac, control+mousewheel may change zoom. On Mac,
// this isn't done for two reasons:
// -the OS already has a gesture to do this through pinch-zoom
@@ -4043,7 +4043,7 @@
}
void WebContentsImpl::CopyToFindPboard() {
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
auto* input_handler = GetFocusedFrameWidgetInputHandler();
if (!input_handler)
return;
@@ -6362,7 +6362,7 @@
}
void WebContentsImpl::Close(RenderViewHost* rvh) {
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
// The UI may be in an event-tracking loop, such as between the
// mouse-down and mouse-up in text selection or a button click.
// Defer the close until after tracking is complete, so that we
@@ -7042,7 +7042,7 @@
controller_.GetLastCommittedEntryIndex(),
controller_.GetEntryCount());
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID)
// Force a ViewMsg_Resize to be sent, needed to make plugins show up on
// linux. See crbug.com/83941.
RenderWidgetHostView* rwh_view = render_view_host->GetWidget()->GetView();
