| 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 1622 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1633 #endif  // TOOLKIT_VIEWS | 1633 #endif  // TOOLKIT_VIEWS | 
| 1634 #if defined(OS_ANDROID) | 1634 #if defined(OS_ANDROID) | 
| 1635     {"reader-mode-heuristics", flag_descriptions::kReaderModeHeuristicsName, | 1635     {"reader-mode-heuristics", flag_descriptions::kReaderModeHeuristicsName, | 
| 1636      flag_descriptions::kReaderModeHeuristicsDescription, kOsAndroid, | 1636      flag_descriptions::kReaderModeHeuristicsDescription, kOsAndroid, | 
| 1637      MULTI_VALUE_TYPE(kReaderModeHeuristicsChoices)}, | 1637      MULTI_VALUE_TYPE(kReaderModeHeuristicsChoices)}, | 
| 1638 #endif  // OS_ANDROID | 1638 #endif  // OS_ANDROID | 
| 1639 #if defined(OS_ANDROID) | 1639 #if defined(OS_ANDROID) | 
| 1640     {"enable-chrome-home", flag_descriptions::kChromeHomeName, | 1640     {"enable-chrome-home", flag_descriptions::kChromeHomeName, | 
| 1641      flag_descriptions::kChromeHomeDescription, kOsAndroid, | 1641      flag_descriptions::kChromeHomeDescription, kOsAndroid, | 
| 1642      FEATURE_VALUE_TYPE(chrome::android::kChromeHomeFeature)}, | 1642      FEATURE_VALUE_TYPE(chrome::android::kChromeHomeFeature)}, | 
|  | 1643     {"enable-chrome-home-expand-button", | 
|  | 1644      flag_descriptions::kChromeHomeExpandButtonName, | 
|  | 1645      flag_descriptions::kChromeHomeExpandButtonDescription, kOsAndroid, | 
|  | 1646      FEATURE_VALUE_TYPE(chrome::android::kChromeHomeExpandButton)}, | 
| 1643 #endif  // OS_ANDROID | 1647 #endif  // OS_ANDROID | 
| 1644 #if defined(OS_ANDROID) | 1648 #if defined(OS_ANDROID) | 
| 1645     {"enable-iph-demo-mode", flag_descriptions::kEnableIphDemoMode, | 1649     {"enable-iph-demo-mode", flag_descriptions::kEnableIphDemoMode, | 
| 1646      flag_descriptions::kEnableIphDemoModeDescription, kOsAndroid, | 1650      flag_descriptions::kEnableIphDemoModeDescription, kOsAndroid, | 
| 1647      FEATURE_VALUE_TYPE(feature_engagement_tracker::kIPHDemoMode)}, | 1651      FEATURE_VALUE_TYPE(feature_engagement_tracker::kIPHDemoMode)}, | 
| 1648 #endif  // OS_ANDROID | 1652 #endif  // OS_ANDROID | 
| 1649     {"num-raster-threads", flag_descriptions::kNumRasterThreadsName, | 1653     {"num-raster-threads", flag_descriptions::kNumRasterThreadsName, | 
| 1650      flag_descriptions::kNumRasterThreadsDescription, kOsAll, | 1654      flag_descriptions::kNumRasterThreadsDescription, kOsAll, | 
| 1651      MULTI_VALUE_TYPE(kNumRasterThreadsChoices)}, | 1655      MULTI_VALUE_TYPE(kNumRasterThreadsChoices)}, | 
| 1652     {"enable-permission-action-reporting", | 1656     {"enable-permission-action-reporting", | 
| (...skipping 1351 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3004 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3008 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 
| 3005 | 3009 | 
| 3006 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3010 const FeatureEntry* GetFeatureEntries(size_t* count) { | 
| 3007   *count = arraysize(kFeatureEntries); | 3011   *count = arraysize(kFeatureEntries); | 
| 3008   return kFeatureEntries; | 3012   return kFeatureEntries; | 
| 3009 } | 3013 } | 
| 3010 | 3014 | 
| 3011 }  // namespace testing | 3015 }  // namespace testing | 
| 3012 | 3016 | 
| 3013 }  // namespace about_flags | 3017 }  // namespace about_flags | 
| OLD | NEW | 
|---|