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

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: Fix a bad merge Created 4 years, 6 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
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 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 switches::kProgressBarAnimation, "disabled" }, 454 switches::kProgressBarAnimation, "disabled" },
455 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_LINEAR, 455 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_LINEAR,
456 switches::kProgressBarAnimation, "linear" }, 456 switches::kProgressBarAnimation, "linear" },
457 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH, 457 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH,
458 switches::kProgressBarAnimation, "smooth" }, 458 switches::kProgressBarAnimation, "smooth" },
459 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH_INDETERMINATE, 459 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH_INDETERMINATE,
460 switches::kProgressBarAnimation, "smooth-indeterminate" }, 460 switches::kProgressBarAnimation, "smooth-indeterminate" },
461 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START, 461 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START,
462 switches::kProgressBarAnimation, "fast-start" }, 462 switches::kProgressBarAnimation, "fast-start" },
463 }; 463 };
464
465 const FeatureEntry::Choice kProgressBarCompletionChoices[] = {
466 {IDS_FLAGS_PROGRESS_BAR_COMPLETION_LOAD_EVENT,
467 switches::kProgressBarCompletion, "loadEvent"},
468 {IDS_FLAGS_PROGRESS_BAR_COMPLETION_RESOURCES_BEFORE_DCL,
469 switches::kProgressBarCompletion, "resourcesBeforeDOMContentLoaded"},
470 {IDS_FLAGS_PROGRESS_BAR_COMPLETION_DOM_CONTENT_LOADED,
471 switches::kProgressBarCompletion, "domContentLoaded"},
472 {IDS_FLAGS_PROGRESS_BAR_COMPLETION_RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRA MES,
473 switches::kProgressBarCompletion,
474 "resourcesBeforeDOMContentLoadedAndSameOriginIFrames"},
475 };
476
464 #endif // defined(OS_ANDROID) 477 #endif // defined(OS_ANDROID)
465 478
466 #if defined(OS_CHROMEOS) 479 #if defined(OS_CHROMEOS)
467 const FeatureEntry::Choice kCrosRegionsModeChoices[] = { 480 const FeatureEntry::Choice kCrosRegionsModeChoices[] = {
468 { IDS_FLAGS_CROS_REGIONS_MODE_DEFAULT, "", "" }, 481 { IDS_FLAGS_CROS_REGIONS_MODE_DEFAULT, "", "" },
469 { IDS_FLAGS_CROS_REGIONS_MODE_OVERRIDE, chromeos::switches::kCrosRegionsMode, 482 { IDS_FLAGS_CROS_REGIONS_MODE_OVERRIDE, chromeos::switches::kCrosRegionsMode,
470 chromeos::switches::kCrosRegionsModeOverride }, 483 chromeos::switches::kCrosRegionsModeOverride },
471 { IDS_FLAGS_CROS_REGIONS_MODE_HIDE, chromeos::switches::kCrosRegionsMode, 484 { IDS_FLAGS_CROS_REGIONS_MODE_HIDE, chromeos::switches::kCrosRegionsMode,
472 chromeos::switches::kCrosRegionsModeHide }, 485 chromeos::switches::kCrosRegionsModeHide },
473 }; 486 };
(...skipping 1144 matching lines...) Expand 10 before | Expand all | Expand 10 after
1618 kOsWin | kOsLinux | kOsCrOS, 1631 kOsWin | kOsLinux | kOsCrOS,
1619 FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)}, 1632 FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)},
1620 {"experimental-keyboard-lock-ui", 1633 {"experimental-keyboard-lock-ui",
1621 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_NAME, 1634 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_NAME,
1622 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_DESCRIPTION, kOsDesktop, 1635 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_DESCRIPTION, kOsDesktop,
1623 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)}, 1636 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)},
1624 #if defined(OS_ANDROID) 1637 #if defined(OS_ANDROID)
1625 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, 1638 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME,
1626 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, 1639 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid,
1627 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, 1640 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)},
1641 {"progress-bar-completion", IDS_FLAGS_PROGRESS_BAR_COMPLETION_NAME,
1642 IDS_FLAGS_PROGRESS_BAR_COMPLETION_DESCRIPTION, kOsAndroid,
1643 MULTI_VALUE_TYPE(kProgressBarCompletionChoices)},
1628 #endif // defined(OS_ANDROID) 1644 #endif // defined(OS_ANDROID)
1629 #if defined(OS_ANDROID) 1645 #if defined(OS_ANDROID)
1630 {"tab-switcher-theme-colors", IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_NAME, 1646 {"tab-switcher-theme-colors", IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_NAME,
1631 IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_DESCRIPTION, kOsAndroid, 1647 IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_DESCRIPTION, kOsAndroid,
1632 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherThemeColors)}, 1648 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherThemeColors)},
1633 #endif // defined(OS_ANDROID) 1649 #endif // defined(OS_ANDROID)
1634 #if defined(OS_ANDROID) 1650 #if defined(OS_ANDROID)
1635 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME, 1651 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME,
1636 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid, 1652 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid,
1637 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)}, 1653 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)},
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698