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 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1184 {"enable-translate-new-ux", IDS_FLAGS_TRANSLATE_NEW_UX_NAME, | 1184 {"enable-translate-new-ux", IDS_FLAGS_TRANSLATE_NEW_UX_NAME, |
1185 IDS_FLAGS_TRANSLATE_NEW_UX_DESCRIPTION, kOsMac, | 1185 IDS_FLAGS_TRANSLATE_NEW_UX_DESCRIPTION, kOsMac, |
1186 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, | 1186 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, |
1187 switches::kDisableTranslateNewUX)}, | 1187 switches::kDisableTranslateNewUX)}, |
1188 #endif | 1188 #endif |
1189 #if defined(OS_MACOSX) | 1189 #if defined(OS_MACOSX) |
1190 {"enable-native-notifications", IDS_NOTIFICATIONS_NATIVE_FLAG, | 1190 {"enable-native-notifications", IDS_NOTIFICATIONS_NATIVE_FLAG, |
1191 IDS_NOTIFICATIONS_NATIVE_FLAG_DESCRIPTION, kOsMac, | 1191 IDS_NOTIFICATIONS_NATIVE_FLAG_DESCRIPTION, kOsMac, |
1192 SINGLE_VALUE_TYPE(switches::kEnableNativeNotifications)}, | 1192 SINGLE_VALUE_TYPE(switches::kEnableNativeNotifications)}, |
1193 #endif | 1193 #endif |
1194 #if defined(ENABLE_NOTIFICATIONS) | |
1195 {"enable-notification-action-icons", | |
1196 IDS_FLAGS_ENABLE_NOTIFICATION_ACTION_ICONS_NAME, | |
johnme
2016/04/18 18:04:06
Please remove both strings from chrome/app/generat
Michael van Ouwerkerk
2016/04/19 09:25:14
Done.
| |
1197 IDS_FLAGS_ENABLE_NOTIFICATION_ACTION_ICONS_DESCRIPTION, kOsAll, | |
1198 SINGLE_VALUE_TYPE(switches::kEnableNotificationActionIcons)}, | |
1199 #endif | |
1200 #if defined(TOOLKIT_VIEWS) | 1194 #if defined(TOOLKIT_VIEWS) |
1201 {"disable-views-rect-based-targeting", // FLAGS:RECORD_UMA | 1195 {"disable-views-rect-based-targeting", // FLAGS:RECORD_UMA |
1202 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_NAME, | 1196 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_NAME, |
1203 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_DESCRIPTION, | 1197 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_DESCRIPTION, |
1204 kOsCrOS | kOsWin | kOsLinux, | 1198 kOsCrOS | kOsWin | kOsLinux, |
1205 SINGLE_DISABLE_VALUE_TYPE( | 1199 SINGLE_DISABLE_VALUE_TYPE( |
1206 views::switches::kDisableViewsRectBasedTargeting)}, | 1200 views::switches::kDisableViewsRectBasedTargeting)}, |
1207 {"enable-link-disambiguation-popup", | 1201 {"enable-link-disambiguation-popup", |
1208 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_NAME, | 1202 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_NAME, |
1209 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_DESCRIPTION, kOsCrOS | kOsWin, | 1203 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_DESCRIPTION, kOsCrOS | kOsWin, |
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2013 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2007 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2014 | 2008 |
2015 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2009 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2016 *count = arraysize(kFeatureEntries); | 2010 *count = arraysize(kFeatureEntries); |
2017 return kFeatureEntries; | 2011 return kFeatureEntries; |
2018 } | 2012 } |
2019 | 2013 |
2020 } // namespace testing | 2014 } // namespace testing |
2021 | 2015 |
2022 } // namespace about_flags | 2016 } // namespace about_flags |
OLD | NEW |