Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 1860743002: Add a flag to change when android's progress bar completes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing flag default Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/browser/frame_host/frame_tree.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 switches::kProgressBarAnimation, "disabled" }, 445 switches::kProgressBarAnimation, "disabled" },
446 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_LINEAR, 446 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_LINEAR,
447 switches::kProgressBarAnimation, "linear" }, 447 switches::kProgressBarAnimation, "linear" },
448 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH, 448 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH,
449 switches::kProgressBarAnimation, "smooth" }, 449 switches::kProgressBarAnimation, "smooth" },
450 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH_INDETERMINATE, 450 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH_INDETERMINATE,
451 switches::kProgressBarAnimation, "smooth-indeterminate" }, 451 switches::kProgressBarAnimation, "smooth-indeterminate" },
452 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START, 452 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START,
453 switches::kProgressBarAnimation, "fast-start" }, 453 switches::kProgressBarAnimation, "fast-start" },
454 }; 454 };
455
456 const FeatureEntry::Choice kProgressBarCompletionChoices[] = {
457 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
458 {IDS_FLAGS_PROGRESS_BAR_COMPLETION_LOAD_EVENT,
459 switches::kProgressBarCompletion, "loadEvent"},
460 {IDS_FLAGS_PROGRESS_BAR_COMPLETION_RESOURCES_BEFORE_DCL,
461 switches::kProgressBarCompletion, "resourcesBeforeDOMContentLoaded"},
462 {IDS_FLAGS_PROGRESS_BAR_COMPLETION_DOM_CONTENT_LOADED,
463 switches::kProgressBarCompletion, "domContentLoaded"},
464 {IDS_FLAGS_PROGRESS_BAR_COMPLETION_RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRA MES,
465 switches::kProgressBarCompletion,
466 "resourcesBeforeDOMContentLoadedAndSameOriginIFrames"},
467 };
468
455 #endif // defined(OS_ANDROID) 469 #endif // defined(OS_ANDROID)
456 470
457 #if defined(OS_CHROMEOS) 471 #if defined(OS_CHROMEOS)
458 const FeatureEntry::Choice kCrosRegionsModeChoices[] = { 472 const FeatureEntry::Choice kCrosRegionsModeChoices[] = {
459 { IDS_FLAGS_CROS_REGIONS_MODE_DEFAULT, "", "" }, 473 { IDS_FLAGS_CROS_REGIONS_MODE_DEFAULT, "", "" },
460 { IDS_FLAGS_CROS_REGIONS_MODE_OVERRIDE, chromeos::switches::kCrosRegionsMode, 474 { IDS_FLAGS_CROS_REGIONS_MODE_OVERRIDE, chromeos::switches::kCrosRegionsMode,
461 chromeos::switches::kCrosRegionsModeOverride }, 475 chromeos::switches::kCrosRegionsModeOverride },
462 { IDS_FLAGS_CROS_REGIONS_MODE_HIDE, chromeos::switches::kCrosRegionsMode, 476 { IDS_FLAGS_CROS_REGIONS_MODE_HIDE, chromeos::switches::kCrosRegionsMode,
463 chromeos::switches::kCrosRegionsModeHide }, 477 chromeos::switches::kCrosRegionsModeHide },
464 }; 478 };
(...skipping 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after
1631 kOsWin | kOsLinux | kOsCrOS, 1645 kOsWin | kOsLinux | kOsCrOS,
1632 FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)}, 1646 FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)},
1633 {"experimental-keyboard-lock-ui", 1647 {"experimental-keyboard-lock-ui",
1634 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_NAME, 1648 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_NAME,
1635 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_DESCRIPTION, kOsDesktop, 1649 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_DESCRIPTION, kOsDesktop,
1636 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)}, 1650 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)},
1637 #if defined(OS_ANDROID) 1651 #if defined(OS_ANDROID)
1638 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, 1652 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME,
1639 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, 1653 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid,
1640 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, 1654 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)},
1655 {"progress-bar-completion", IDS_FLAGS_PROGRESS_BAR_COMPLETION_NAME,
1656 IDS_FLAGS_PROGRESS_BAR_COMPLETION_DESCRIPTION, kOsAndroid,
1657 MULTI_VALUE_TYPE(kProgressBarCompletionChoices)},
1641 #endif // defined(OS_ANDROID) 1658 #endif // defined(OS_ANDROID)
1642 #if defined(OS_ANDROID) 1659 #if defined(OS_ANDROID)
1643 {"tab-switcher-theme-colors", IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_NAME, 1660 {"tab-switcher-theme-colors", IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_NAME,
1644 IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_DESCRIPTION, kOsAndroid, 1661 IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_DESCRIPTION, kOsAndroid,
1645 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherThemeColors)}, 1662 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherThemeColors)},
1646 #endif // defined(OS_ANDROID) 1663 #endif // defined(OS_ANDROID)
1647 #if defined(OS_ANDROID) 1664 #if defined(OS_ANDROID)
1648 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME, 1665 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME,
1649 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid, 1666 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid,
1650 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)}, 1667 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)},
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
2157 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2174 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2158 2175
2159 const FeatureEntry* GetFeatureEntries(size_t* count) { 2176 const FeatureEntry* GetFeatureEntries(size_t* count) {
2160 *count = arraysize(kFeatureEntries); 2177 *count = arraysize(kFeatureEntries);
2161 return kFeatureEntries; 2178 return kFeatureEntries;
2162 } 2179 }
2163 2180
2164 } // namespace testing 2181 } // namespace testing
2165 2182
2166 } // namespace about_flags 2183 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/browser/frame_host/frame_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698