Migrate to OS_MAC and OS_APPLE in chrome/browser/ part 1
This migrates:
defined(OS_MACOSX) -> defined(OS_APPLE)
defined(OS_MACOSX) && !defined(OS_IOS) -> defined(OS_MAC)
!defined(OS_MACOSX) || defined(OS_IOS) -> !defined(OS_MAC)
Bug: 1105907
Change-Id: I0590b7f22dd27637d7220ba4a09837421457638f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2321508
Reviewed-by: Alexei Svitkine <[email protected]>
Reviewed-by: Robert Sesek <[email protected]>
Commit-Queue: Robert Sesek <[email protected]>
Auto-Submit: Avi Drissman <[email protected]>
Cr-Commit-Position: refs/heads/master@{#792729}
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 617e461..f5224ee1 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -147,7 +147,7 @@
#if defined(OS_WIN)
#include "base/win/windows_version.h"
-#elif defined(OS_MACOSX)
+#elif defined(OS_MAC)
#include "chrome/browser/chrome_browser_main_mac.h"
#include "chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h"
#endif
@@ -270,7 +270,7 @@
ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
chrome::kChromeSearchScheme);
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
ui::InitIdleMonitor();
#endif
@@ -331,7 +331,7 @@
DCHECK(!webrtc_event_log_manager_);
webrtc_event_log_manager_ = WebRtcEventLogManager::CreateSingletonInstance();
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
system_media_permissions::LogSystemMediaPermissionsStartupStats();
#endif
}
@@ -345,7 +345,7 @@
}
#endif
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
void BrowserProcessImpl::ClearQuitClosure() {
quit_closure_.Reset();
}
@@ -1420,7 +1420,7 @@
CHECK(base::RunLoop::IsRunningOnCurrentThread());
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::BindOnce(ChromeBrowserMainPartsMac::DidEndMainMessageLoop));
