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 1349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1360 SINGLE_DISABLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect)}, | 1360 SINGLE_DISABLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect)}, |
1361 #endif | 1361 #endif |
1362 #if defined(OS_MACOSX) | 1362 #if defined(OS_MACOSX) |
1363 {"enable-translate-new-ux", | 1363 {"enable-translate-new-ux", |
1364 IDS_FLAGS_TRANSLATE_NEW_UX_NAME, | 1364 IDS_FLAGS_TRANSLATE_NEW_UX_NAME, |
1365 IDS_FLAGS_TRANSLATE_NEW_UX_DESCRIPTION, | 1365 IDS_FLAGS_TRANSLATE_NEW_UX_DESCRIPTION, |
1366 kOsMac, | 1366 kOsMac, |
1367 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, | 1367 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, |
1368 switches::kDisableTranslateNewUX)}, | 1368 switches::kDisableTranslateNewUX)}, |
1369 #endif | 1369 #endif |
| 1370 #if defined(OS_MACOSX) |
| 1371 {"enable-native-notifications", |
| 1372 IDS_NOTIFICATIONS_NATIVE_FLAG, |
| 1373 IDS_NOTIFICATIONS_NATIVE_FLAG_DESCRIPTION, |
| 1374 kOsMac, |
| 1375 SINGLE_VALUE_TYPE(switches::kEnableNativeNotifications)}, |
| 1376 #endif |
1370 #if defined(TOOLKIT_VIEWS) | 1377 #if defined(TOOLKIT_VIEWS) |
1371 {"disable-views-rect-based-targeting", // FLAGS:RECORD_UMA | 1378 {"disable-views-rect-based-targeting", // FLAGS:RECORD_UMA |
1372 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_NAME, | 1379 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_NAME, |
1373 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_DESCRIPTION, | 1380 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_DESCRIPTION, |
1374 kOsCrOS | kOsWin | kOsLinux, | 1381 kOsCrOS | kOsWin | kOsLinux, |
1375 SINGLE_DISABLE_VALUE_TYPE( | 1382 SINGLE_DISABLE_VALUE_TYPE( |
1376 views::switches::kDisableViewsRectBasedTargeting)}, | 1383 views::switches::kDisableViewsRectBasedTargeting)}, |
1377 {"enable-link-disambiguation-popup", | 1384 {"enable-link-disambiguation-popup", |
1378 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_NAME, | 1385 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_NAME, |
1379 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_DESCRIPTION, | 1386 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_DESCRIPTION, |
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2267 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2274 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2268 | 2275 |
2269 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2276 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2270 *count = arraysize(kFeatureEntries); | 2277 *count = arraysize(kFeatureEntries); |
2271 return kFeatureEntries; | 2278 return kFeatureEntries; |
2272 } | 2279 } |
2273 | 2280 |
2274 } // namespace testing | 2281 } // namespace testing |
2275 | 2282 |
2276 } // namespace about_flags | 2283 } // namespace about_flags |
OLD | NEW |