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 1361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1372 SINGLE_DISABLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect)}, | 1372 SINGLE_DISABLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect)}, |
1373 #endif | 1373 #endif |
1374 #if defined(OS_MACOSX) | 1374 #if defined(OS_MACOSX) |
1375 {"enable-translate-new-ux", | 1375 {"enable-translate-new-ux", |
1376 IDS_FLAGS_TRANSLATE_NEW_UX_NAME, | 1376 IDS_FLAGS_TRANSLATE_NEW_UX_NAME, |
1377 IDS_FLAGS_TRANSLATE_NEW_UX_DESCRIPTION, | 1377 IDS_FLAGS_TRANSLATE_NEW_UX_DESCRIPTION, |
1378 kOsMac, | 1378 kOsMac, |
1379 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, | 1379 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, |
1380 switches::kDisableTranslateNewUX)}, | 1380 switches::kDisableTranslateNewUX)}, |
1381 #endif | 1381 #endif |
| 1382 #if defined(OS_MACOSX) |
| 1383 {"enable-native-notifications", |
| 1384 IDS_NOTIFICATIONS_NATIVE_FLAG, |
| 1385 IDS_NOTIFICATIONS_NATIVE_FLAG_DESCRIPTION, |
| 1386 kOsMac, |
| 1387 SINGLE_VALUE_TYPE(switches::kEnableNativeNotifications)}, |
| 1388 #endif |
1382 #if defined(TOOLKIT_VIEWS) | 1389 #if defined(TOOLKIT_VIEWS) |
1383 {"disable-views-rect-based-targeting", // FLAGS:RECORD_UMA | 1390 {"disable-views-rect-based-targeting", // FLAGS:RECORD_UMA |
1384 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_NAME, | 1391 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_NAME, |
1385 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_DESCRIPTION, | 1392 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_DESCRIPTION, |
1386 kOsCrOS | kOsWin | kOsLinux, | 1393 kOsCrOS | kOsWin | kOsLinux, |
1387 SINGLE_DISABLE_VALUE_TYPE( | 1394 SINGLE_DISABLE_VALUE_TYPE( |
1388 views::switches::kDisableViewsRectBasedTargeting)}, | 1395 views::switches::kDisableViewsRectBasedTargeting)}, |
1389 {"enable-link-disambiguation-popup", | 1396 {"enable-link-disambiguation-popup", |
1390 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_NAME, | 1397 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_NAME, |
1391 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_DESCRIPTION, | 1398 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_DESCRIPTION, |
(...skipping 894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2286 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2293 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2287 | 2294 |
2288 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2295 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2289 *count = arraysize(kFeatureEntries); | 2296 *count = arraysize(kFeatureEntries); |
2290 return kFeatureEntries; | 2297 return kFeatureEntries; |
2291 } | 2298 } |
2292 | 2299 |
2293 } // namespace testing | 2300 } // namespace testing |
2294 | 2301 |
2295 } // namespace about_flags | 2302 } // namespace about_flags |
OLD | NEW |