Remove redundant OS_CHROMEOS checks
The OS_CHROMEOS define implies OS_LINUX. So a preprocessor conditional like:
if defined(OS_LINUX) || defined(OS_CHROMEOS)
is redundant and should just be:
if defined(OS_LINUX).
Bug: 290185 (kind of)
Change-Id: I382c636d2641ae95b2a00516fbfd3a494640a9fb
Reviewed-on: https://chromium-review.googlesource.com/534776
Reviewed-by: Brett Wilson <[email protected]>
Reviewed-by: Dan Erat <[email protected]>
Commit-Queue: Michael Giuffrida <[email protected]>
Cr-Commit-Position: refs/heads/master@{#491356}diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index e1ac7d3e..051a5bb8 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -892,8 +892,7 @@
{"Learning", kSpeculativeResourcePrefetchingLearning,
arraysize(kSpeculativeResourcePrefetchingLearning), nullptr}};
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
- defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
const FeatureEntry::FeatureParam kPauseBackgroundTabsMinimalEngagment[] = {
{pausetabs::kFeatureName, pausetabs::kModeParamMinimal}};
@@ -1821,12 +1820,12 @@
ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX,
switches::kDisableTranslateNewUX)},
#endif // OS_MACOSX
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_WIN)
{"translate-2016q2-ui", flag_descriptions::kTranslate2016q2UiName,
flag_descriptions::kTranslate2016q2UiDescription,
kOsCrOS | kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(translate::kTranslateUI2016Q2)},
-#endif // OS_LINUX || OS_WIN || OS_CHROMEOS
+#endif // OS_LINUX || OS_WIN
{"translate-lang-by-ulp", flag_descriptions::kTranslateLanguageByUlpName,
flag_descriptions::kTranslateLanguageByUlpDescription, kOsAll,
FEATURE_VALUE_TYPE(translate::kTranslateLanguageByULP)},
@@ -2915,8 +2914,7 @@
flag_descriptions::kNewOmniboxAnswerTypesDescription, kOsAll,
FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)},
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
- defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
{"omnibox-entity-suggestions",
flag_descriptions::kOmniboxEntitySuggestionsName,
flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop,
@@ -2927,8 +2925,7 @@
{"enable-new-app-menu-icon", flag_descriptions::kEnableNewAppMenuIconName,
flag_descriptions::kEnableNewAppMenuIconDescription, kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableNewAppMenuIcon)},
-#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) ||
- // defined(OS_WIN)
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
#if defined(OS_ANDROID)
{"enable-custom-feedback-ui",
@@ -2995,8 +2992,7 @@
FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)},
#endif // OS_ANDROID
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
- defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
{pausetabs::kFeatureName, flag_descriptions::kPauseBackgroundTabsName,
flag_descriptions::kPauseBackgroundTabsDescription, kOsDesktop,
FEATURE_WITH_PARAMS_VALUE_TYPE(pausetabs::kFeature,
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index e187362..697a8ff 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -137,7 +137,7 @@
subresource_filter::ContentRulesetService*
subresource_filter_ruleset_service() override;
-#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
void StartAutoupdateTimer() override;
#endif
@@ -297,7 +297,7 @@
std::unique_ptr<ChromeResourceDispatcherHostDelegate>
resource_dispatcher_host_delegate_;
-#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
base::RepeatingTimer autoupdate_timer_;
// Gets called by autoupdate timer to see if browser needs restart and can be
@@ -305,7 +305,7 @@
void OnAutoupdateTimer();
bool CanAutorestartForUpdate() const;
void RestartBackgroundInstance();
-#endif // defined(OS_WIN) || defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
// component updater is normally not used under ChromeOS due
// to concerns over integrity of data shared between profiles,
diff --git a/chrome/browser/dom_distiller/tab_utils_browsertest.cc b/chrome/browser/dom_distiller/tab_utils_browsertest.cc
index c494ba3..289963b 100644
--- a/chrome/browser/dom_distiller/tab_utils_browsertest.cc
+++ b/chrome/browser/dom_distiller/tab_utils_browsertest.cc
@@ -86,7 +86,7 @@
bool loaded_distiller_page_;
};
-#if (defined(OS_LINUX) && defined(OS_CHROMEOS))
+#if defined(OS_CHROMEOS)
#define MAYBE_TestSwapWebContents DISABLED_TestSwapWebContents
#else
#define MAYBE_TestSwapWebContents TestSwapWebContents
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
index 57e7f29..e4d273b 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -875,7 +875,7 @@
target_info->is_filetype_handled_safely)
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX)
if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
#endif
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 50703f2..f607992 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2444,8 +2444,7 @@
#endif // defined(OS_WIN)
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
- defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
const char kOmniboxEntitySuggestionsName[] = "Omnibox entity suggestions";
const char kOmniboxEntitySuggestionsDescription[] =
@@ -2465,8 +2464,7 @@
const char kEnableNewAppMenuIconDescription[] =
"Use the new app menu icon with update notification animations.";
-#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) ||
- // defined(OS_WIN)
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
#if defined(OS_CHROMEOS)
diff --git a/chrome/browser/interstitials/chrome_controller_client.cc b/chrome/browser/interstitials/chrome_controller_client.cc
index 736ee9c..ea9d7be 100644
--- a/chrome/browser/interstitials/chrome_controller_client.cc
+++ b/chrome/browser/interstitials/chrome_controller_client.cc
@@ -129,8 +129,8 @@
ChromeControllerClient::~ChromeControllerClient() {}
bool ChromeControllerClient::CanLaunchDateAndTimeSettings() {
-#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
- defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
+ defined(OS_WIN)
return true;
#else
return false;
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
index 241f8b93..1381afa 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -106,7 +106,7 @@
}
#endif // #if !defined(OS_ANDROID)
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_ANDROID) || defined(OS_LINUX)
return net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE;
#else
return net::URLRequestContextBuilder::HttpCacheParams::DISK_BLOCKFILE;
diff --git a/chrome/browser/sync/chrome_sync_client.cc b/chrome/browser/sync/chrome_sync_client.cc
index 0372c458..0eb9d41 100644
--- a/chrome/browser/sync/chrome_sync_client.cc
+++ b/chrome/browser/sync/chrome_sync_client.cc
@@ -666,7 +666,7 @@
}
#endif // BUILDFLAG(ENABLE_APP_LIST)
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_WIN)
// Dictionary sync is enabled by default.
if (!disabled_types.Has(syncer::DICTIONARY)) {
sync_service->RegisterDataTypeController(
@@ -674,7 +674,7 @@
syncer::DICTIONARY, error_callback, this, syncer::GROUP_UI,
BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)));
}
-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
+#endif // defined(OS_LINUX) || defined(OS_WIN)
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
sync_service->RegisterDataTypeController(
diff --git a/chrome/browser/ui/sad_tab.cc b/chrome/browser/ui/sad_tab.cc
index f33f7f8c..465ab1e 100644
--- a/chrome/browser/ui/sad_tab.cc
+++ b/chrome/browser/ui/sad_tab.cc
@@ -8,6 +8,7 @@
#include "base/metrics/histogram_macros.h"
#include "base/time/time.h"
+#include "build/build_config.h"
#include "chrome/browser/net/referrer.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -182,7 +183,7 @@
// Only show incognito suggestion if not already in Incognito mode.
if (!web_contents_->GetBrowserContext()->IsOffTheRecord())
message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO);
-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_MACOSX) || defined(OS_LINUX)
// Note: on macOS, Linux and ChromeOS, the first bullet is either one of
// IDS_SAD_TAB_RELOAD_CLOSE_TABS or IDS_SAD_TAB_RELOAD_CLOSE_NOTABS
// followed by one of the above suggestions.
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index 71f345e1..0474098 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -600,7 +600,7 @@
else
target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_);
-#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if !defined(OS_LINUX)
// EndMoveLoop is going to snap the window back to its original location.
// Hide it so users don't see this. Hiding a window in Linux aura causes
// it to lose capture so skip it.
