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 1379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1390 SINGLE_DISABLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect)}, | 1390 SINGLE_DISABLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect)}, |
1391 #endif | 1391 #endif |
1392 #if defined(OS_MACOSX) | 1392 #if defined(OS_MACOSX) |
1393 {"enable-translate-new-ux", | 1393 {"enable-translate-new-ux", |
1394 IDS_FLAGS_TRANSLATE_NEW_UX_NAME, | 1394 IDS_FLAGS_TRANSLATE_NEW_UX_NAME, |
1395 IDS_FLAGS_TRANSLATE_NEW_UX_DESCRIPTION, | 1395 IDS_FLAGS_TRANSLATE_NEW_UX_DESCRIPTION, |
1396 kOsMac, | 1396 kOsMac, |
1397 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, | 1397 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, |
1398 switches::kDisableTranslateNewUX)}, | 1398 switches::kDisableTranslateNewUX)}, |
1399 #endif | 1399 #endif |
| 1400 #if defined(OS_MACOSX) |
| 1401 {"enable-native-notifications", |
| 1402 IDS_NOTIFICATIONS_NATIVE_FLAG, |
| 1403 IDS_NOTIFICATIONS_NATIVE_FLAG_DESCRIPTION, |
| 1404 kOsMac, |
| 1405 SINGLE_VALUE_TYPE(switches::kEnableNativeNotifications)}, |
| 1406 #endif |
1400 #if defined(TOOLKIT_VIEWS) | 1407 #if defined(TOOLKIT_VIEWS) |
1401 {"disable-views-rect-based-targeting", // FLAGS:RECORD_UMA | 1408 {"disable-views-rect-based-targeting", // FLAGS:RECORD_UMA |
1402 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_NAME, | 1409 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_NAME, |
1403 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_DESCRIPTION, | 1410 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_DESCRIPTION, |
1404 kOsCrOS | kOsWin | kOsLinux, | 1411 kOsCrOS | kOsWin | kOsLinux, |
1405 SINGLE_DISABLE_VALUE_TYPE( | 1412 SINGLE_DISABLE_VALUE_TYPE( |
1406 views::switches::kDisableViewsRectBasedTargeting)}, | 1413 views::switches::kDisableViewsRectBasedTargeting)}, |
1407 {"enable-link-disambiguation-popup", | 1414 {"enable-link-disambiguation-popup", |
1408 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_NAME, | 1415 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_NAME, |
1409 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_DESCRIPTION, | 1416 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_DESCRIPTION, |
(...skipping 911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2321 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2328 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2322 | 2329 |
2323 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2330 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2324 *count = arraysize(kFeatureEntries); | 2331 *count = arraysize(kFeatureEntries); |
2325 return kFeatureEntries; | 2332 return kFeatureEntries; |
2326 } | 2333 } |
2327 | 2334 |
2328 } // namespace testing | 2335 } // namespace testing |
2329 | 2336 |
2330 } // namespace about_flags | 2337 } // namespace about_flags |
OLD | NEW |