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