Commit 09fb058d authored by tonikitoo's avatar tonikitoo Committed by Commit bot

Guard native notification code under ENABLE_NATIVE_NOTIFICATIONS guards

about_flags.cc today opt in/out configurations manually, rather
than using the existing ENABLE_NATIVE_NOTIFICATIONS build flag.

This fixes the OZONE/Linux build.

BUG=676220
R=thomasanderson@google.com

Review-Url: https://codereview.chromium.org/2802243002
Cr-Commit-Position: refs/heads/master@{#462896}
parent 69436adf
...@@ -1528,11 +1528,11 @@ const FeatureEntry kFeatureEntries[] = { ...@@ -1528,11 +1528,11 @@ const FeatureEntry kFeatureEntries[] = {
{"translate-lang-by-ulp", flag_descriptions::kTranslateLanguageByUlpName, {"translate-lang-by-ulp", flag_descriptions::kTranslateLanguageByUlpName,
flag_descriptions::kTranslateLanguageByUlpDescription, kOsAll, flag_descriptions::kTranslateLanguageByUlpDescription, kOsAll,
FEATURE_VALUE_TYPE(translate::kTranslateLanguageByULP)}, FEATURE_VALUE_TYPE(translate::kTranslateLanguageByULP)},
#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
{"enable-native-notifications", flag_descriptions::kNotificationsNativeFlag, {"enable-native-notifications", flag_descriptions::kNotificationsNativeFlag,
flag_descriptions::kNotificationsNativeFlagDescription, kOsMac | kOsLinux, flag_descriptions::kNotificationsNativeFlagDescription, kOsMac | kOsLinux,
FEATURE_VALUE_TYPE(features::kNativeNotifications)}, FEATURE_VALUE_TYPE(features::kNativeNotifications)},
#endif // defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) #endif // ENABLE_NATIVE_NOTIFICATIONS
#if defined(TOOLKIT_VIEWS) #if defined(TOOLKIT_VIEWS)
{"disable-views-rect-based-targeting", {"disable-views-rect-based-targeting",
flag_descriptions::kViewsRectBasedTargetingName, flag_descriptions::kViewsRectBasedTargetingName,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment