| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/about_flags.h" | 5 #include "chrome/browser/about_flags.h" |
| 6 | 6 |
| 7 #include <iterator> | 7 #include <iterator> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1219 {"enable-translate-new-ux", IDS_FLAGS_TRANSLATE_NEW_UX_NAME, | 1219 {"enable-translate-new-ux", IDS_FLAGS_TRANSLATE_NEW_UX_NAME, |
| 1220 IDS_FLAGS_TRANSLATE_NEW_UX_DESCRIPTION, kOsMac, | 1220 IDS_FLAGS_TRANSLATE_NEW_UX_DESCRIPTION, kOsMac, |
| 1221 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, | 1221 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, |
| 1222 switches::kDisableTranslateNewUX)}, | 1222 switches::kDisableTranslateNewUX)}, |
| 1223 #endif | 1223 #endif |
| 1224 #if defined(OS_MACOSX) | 1224 #if defined(OS_MACOSX) |
| 1225 {"enable-native-notifications", IDS_NOTIFICATIONS_NATIVE_FLAG, | 1225 {"enable-native-notifications", IDS_NOTIFICATIONS_NATIVE_FLAG, |
| 1226 IDS_NOTIFICATIONS_NATIVE_FLAG_DESCRIPTION, kOsMac, | 1226 IDS_NOTIFICATIONS_NATIVE_FLAG_DESCRIPTION, kOsMac, |
| 1227 SINGLE_VALUE_TYPE(switches::kEnableNativeNotifications)}, | 1227 SINGLE_VALUE_TYPE(switches::kEnableNativeNotifications)}, |
| 1228 #endif | 1228 #endif |
| 1229 #if defined(ENABLE_NOTIFICATIONS) |
| 1230 {"enable-notification-action-icons", |
| 1231 IDS_FLAGS_ENABLE_NOTIFICATION_ACTION_ICONS_NAME, |
| 1232 IDS_FLAGS_ENABLE_NOTIFICATION_ACTION_ICONS_DESCRIPTION, kOsAll, |
| 1233 SINGLE_VALUE_TYPE(switches::kEnableNotificationActionIcons)}, |
| 1234 #endif |
| 1229 #if defined(TOOLKIT_VIEWS) | 1235 #if defined(TOOLKIT_VIEWS) |
| 1230 {"disable-views-rect-based-targeting", // FLAGS:RECORD_UMA | 1236 {"disable-views-rect-based-targeting", // FLAGS:RECORD_UMA |
| 1231 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_NAME, | 1237 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_NAME, |
| 1232 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_DESCRIPTION, | 1238 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_DESCRIPTION, |
| 1233 kOsCrOS | kOsWin | kOsLinux, | 1239 kOsCrOS | kOsWin | kOsLinux, |
| 1234 SINGLE_DISABLE_VALUE_TYPE( | 1240 SINGLE_DISABLE_VALUE_TYPE( |
| 1235 views::switches::kDisableViewsRectBasedTargeting)}, | 1241 views::switches::kDisableViewsRectBasedTargeting)}, |
| 1236 {"enable-link-disambiguation-popup", | 1242 {"enable-link-disambiguation-popup", |
| 1237 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_NAME, | 1243 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_NAME, |
| 1238 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_DESCRIPTION, kOsCrOS | kOsWin, | 1244 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_DESCRIPTION, kOsCrOS | kOsWin, |
| (...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2009 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2015 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2010 | 2016 |
| 2011 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2017 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2012 *count = arraysize(kFeatureEntries); | 2018 *count = arraysize(kFeatureEntries); |
| 2013 return kFeatureEntries; | 2019 return kFeatureEntries; |
| 2014 } | 2020 } |
| 2015 | 2021 |
| 2016 } // namespace testing | 2022 } // namespace testing |
| 2017 | 2023 |
| 2018 } // namespace about_flags | 2024 } // namespace about_flags |
| OLD | NEW |