| commit | 2e458df2d54a14e6ce71f4068feeb8f0b13eb27a | [log] [tgz] |
|---|---|---|
| author | Avi Drissman <[email protected]> | Wed Jul 29 16:24:31 2020 |
| committer | Commit Bot <[email protected]> | Wed Jul 29 16:24:31 2020 |
| tree | 42405f885eb9088c51e56f3105dd6bffda022745 | |
| parent | f40e2d02801df0a75a88a63e76ede485739e2d22 [diff] [blame] |
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/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc index 1e063a0c..f7354d4d 100644 --- a/chrome/browser/plugins/plugins_resource_service.cc +++ b/chrome/browser/plugins/plugins_resource_service.cc
@@ -64,7 +64,7 @@ filename = "plugins_chromeos.json"; #elif defined(OS_LINUX) filename = "plugins_linux.json"; -#elif defined(OS_MACOSX) +#elif defined(OS_MAC) filename = "plugins_mac.json"; #else #error Unknown platform