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