| 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 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 452 switches::kProgressBarAnimation, "disabled" }, | 452 switches::kProgressBarAnimation, "disabled" }, |
| 453 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_LINEAR, | 453 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_LINEAR, |
| 454 switches::kProgressBarAnimation, "linear" }, | 454 switches::kProgressBarAnimation, "linear" }, |
| 455 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH, | 455 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH, |
| 456 switches::kProgressBarAnimation, "smooth" }, | 456 switches::kProgressBarAnimation, "smooth" }, |
| 457 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH_INDETERMINATE, | 457 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH_INDETERMINATE, |
| 458 switches::kProgressBarAnimation, "smooth-indeterminate" }, | 458 switches::kProgressBarAnimation, "smooth-indeterminate" }, |
| 459 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START, | 459 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START, |
| 460 switches::kProgressBarAnimation, "fast-start" }, | 460 switches::kProgressBarAnimation, "fast-start" }, |
| 461 }; | 461 }; |
| 462 |
| 463 const FeatureEntry::Choice kProgressBarCompletionChoices[] = { |
| 464 {IDS_FLAGS_PROGRESS_BAR_COMPLETION_LOAD_EVENT, |
| 465 switches::kProgressBarCompletion, "loadEvent"}, |
| 466 {IDS_FLAGS_PROGRESS_BAR_COMPLETION_RESOURCES_BEFORE_DCL, |
| 467 switches::kProgressBarCompletion, "resourcesBeforeDOMContentLoaded"}, |
| 468 {IDS_FLAGS_PROGRESS_BAR_COMPLETION_DOM_CONTENT_LOADED, |
| 469 switches::kProgressBarCompletion, "domContentLoaded"}, |
| 470 {IDS_FLAGS_PROGRESS_BAR_COMPLETION_RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRA
MES, |
| 471 switches::kProgressBarCompletion, |
| 472 "resourcesBeforeDOMContentLoadedAndSameOriginIFrames"}, |
| 473 }; |
| 474 |
| 462 #endif // defined(OS_ANDROID) | 475 #endif // defined(OS_ANDROID) |
| 463 | 476 |
| 464 #if defined(OS_CHROMEOS) | 477 #if defined(OS_CHROMEOS) |
| 465 const FeatureEntry::Choice kCrosRegionsModeChoices[] = { | 478 const FeatureEntry::Choice kCrosRegionsModeChoices[] = { |
| 466 { IDS_FLAGS_CROS_REGIONS_MODE_DEFAULT, "", "" }, | 479 { IDS_FLAGS_CROS_REGIONS_MODE_DEFAULT, "", "" }, |
| 467 { IDS_FLAGS_CROS_REGIONS_MODE_OVERRIDE, chromeos::switches::kCrosRegionsMode, | 480 { IDS_FLAGS_CROS_REGIONS_MODE_OVERRIDE, chromeos::switches::kCrosRegionsMode, |
| 468 chromeos::switches::kCrosRegionsModeOverride }, | 481 chromeos::switches::kCrosRegionsModeOverride }, |
| 469 { IDS_FLAGS_CROS_REGIONS_MODE_HIDE, chromeos::switches::kCrosRegionsMode, | 482 { IDS_FLAGS_CROS_REGIONS_MODE_HIDE, chromeos::switches::kCrosRegionsMode, |
| 470 chromeos::switches::kCrosRegionsModeHide }, | 483 chromeos::switches::kCrosRegionsModeHide }, |
| 471 }; | 484 }; |
| (...skipping 1132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1604 kOsWin | kOsLinux | kOsCrOS, | 1617 kOsWin | kOsLinux | kOsCrOS, |
| 1605 FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)}, | 1618 FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)}, |
| 1606 {"experimental-keyboard-lock-ui", | 1619 {"experimental-keyboard-lock-ui", |
| 1607 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_NAME, | 1620 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_NAME, |
| 1608 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_DESCRIPTION, kOsDesktop, | 1621 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_DESCRIPTION, kOsDesktop, |
| 1609 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)}, | 1622 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)}, |
| 1610 #if defined(OS_ANDROID) | 1623 #if defined(OS_ANDROID) |
| 1611 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, | 1624 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, |
| 1612 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, | 1625 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, |
| 1613 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, | 1626 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, |
| 1627 {"progress-bar-completion", IDS_FLAGS_PROGRESS_BAR_COMPLETION_NAME, |
| 1628 IDS_FLAGS_PROGRESS_BAR_COMPLETION_DESCRIPTION, kOsAndroid, |
| 1629 MULTI_VALUE_TYPE(kProgressBarCompletionChoices)}, |
| 1614 #endif // defined(OS_ANDROID) | 1630 #endif // defined(OS_ANDROID) |
| 1615 #if defined(OS_ANDROID) | 1631 #if defined(OS_ANDROID) |
| 1616 {"tab-switcher-theme-colors", IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_NAME, | 1632 {"tab-switcher-theme-colors", IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_NAME, |
| 1617 IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_DESCRIPTION, kOsAndroid, | 1633 IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_DESCRIPTION, kOsAndroid, |
| 1618 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherThemeColors)}, | 1634 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherThemeColors)}, |
| 1619 #endif // defined(OS_ANDROID) | 1635 #endif // defined(OS_ANDROID) |
| 1620 #if defined(OS_ANDROID) | 1636 #if defined(OS_ANDROID) |
| 1621 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME, | 1637 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME, |
| 1622 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid, | 1638 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid, |
| 1623 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)}, | 1639 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)}, |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2119 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2135 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2120 | 2136 |
| 2121 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2137 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2122 *count = arraysize(kFeatureEntries); | 2138 *count = arraysize(kFeatureEntries); |
| 2123 return kFeatureEntries; | 2139 return kFeatureEntries; |
| 2124 } | 2140 } |
| 2125 | 2141 |
| 2126 } // namespace testing | 2142 } // namespace testing |
| 2127 | 2143 |
| 2128 } // namespace about_flags | 2144 } // namespace about_flags |
| OLD | NEW |