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

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 flag to include same origin iframes 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 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 switches::kProgressBarAnimation, "disabled" }, 455 switches::kProgressBarAnimation, "disabled" },
456 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_LINEAR, 456 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_LINEAR,
457 switches::kProgressBarAnimation, "linear" }, 457 switches::kProgressBarAnimation, "linear" },
458 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH, 458 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH,
459 switches::kProgressBarAnimation, "smooth" }, 459 switches::kProgressBarAnimation, "smooth" },
460 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH_INDETERMINATE, 460 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH_INDETERMINATE,
461 switches::kProgressBarAnimation, "smooth-indeterminate" }, 461 switches::kProgressBarAnimation, "smooth-indeterminate" },
462 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START, 462 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START,
463 switches::kProgressBarAnimation, "fast-start" }, 463 switches::kProgressBarAnimation, "fast-start" },
464 }; 464 };
465
466 const FeatureEntry::Choice kProgressBarCompletionChoices[] = {
467 {IDS_FLAGS_PROGRESS_BAR_COMPLETION_LOAD_EVENT,
468 switches::kProgressBarCompletion, "loadEvent"},
469 {IDS_FLAGS_PROGRESS_BAR_COMPLETION_RESOURCES_BEFORE_DCL,
470 switches::kProgressBarCompletion, "resourcesBeforeDOMContentLoaded"},
471 {IDS_FLAGS_PROGRESS_BAR_COMPLETION_DOM_CONTENT_LOADED,
472 switches::kProgressBarCompletion, "domContentLoaded"},
473 {IDS_FLAGS_PROGRESS_BAR_COMPLETION_RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRA MES,
474 switches::kProgressBarCompletion,
475 "resourcesBeforeDOMContentLoadedAndSameOriginIFrames"},
476 };
477
465 #endif // defined(OS_ANDROID) 478 #endif // defined(OS_ANDROID)
466 479
467 #if defined(OS_CHROMEOS) 480 #if defined(OS_CHROMEOS)
468 const FeatureEntry::Choice kCrosRegionsModeChoices[] = { 481 const FeatureEntry::Choice kCrosRegionsModeChoices[] = {
469 { IDS_FLAGS_CROS_REGIONS_MODE_DEFAULT, "", "" }, 482 { IDS_FLAGS_CROS_REGIONS_MODE_DEFAULT, "", "" },
470 { IDS_FLAGS_CROS_REGIONS_MODE_OVERRIDE, chromeos::switches::kCrosRegionsMode, 483 { IDS_FLAGS_CROS_REGIONS_MODE_OVERRIDE, chromeos::switches::kCrosRegionsMode,
471 chromeos::switches::kCrosRegionsModeOverride }, 484 chromeos::switches::kCrosRegionsModeOverride },
472 { IDS_FLAGS_CROS_REGIONS_MODE_HIDE, chromeos::switches::kCrosRegionsMode, 485 { IDS_FLAGS_CROS_REGIONS_MODE_HIDE, chromeos::switches::kCrosRegionsMode,
473 chromeos::switches::kCrosRegionsModeHide }, 486 chromeos::switches::kCrosRegionsModeHide },
474 }; 487 };
(...skipping 1147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1622 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, 1635 kOsWin | kOsLinux | kOsCrOS | kOsAndroid,
1623 FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)}, 1636 FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)},
1624 {"experimental-keyboard-lock-ui", 1637 {"experimental-keyboard-lock-ui",
1625 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_NAME, 1638 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_NAME,
1626 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_DESCRIPTION, kOsDesktop, 1639 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_DESCRIPTION, kOsDesktop,
1627 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)}, 1640 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)},
1628 #if defined(OS_ANDROID) 1641 #if defined(OS_ANDROID)
1629 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, 1642 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME,
1630 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, 1643 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid,
1631 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, 1644 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)},
1645 {"progress-bar-completion", IDS_FLAGS_PROGRESS_BAR_COMPLETION_NAME,
1646 IDS_FLAGS_PROGRESS_BAR_COMPLETION_DESCRIPTION, kOsAndroid,
1647 MULTI_VALUE_TYPE(kProgressBarCompletionChoices)},
1632 #endif // defined(OS_ANDROID) 1648 #endif // defined(OS_ANDROID)
1633 #if defined(OS_ANDROID) 1649 #if defined(OS_ANDROID)
1634 {"tab-switcher-theme-colors", IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_NAME, 1650 {"tab-switcher-theme-colors", IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_NAME,
1635 IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_DESCRIPTION, kOsAndroid, 1651 IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_DESCRIPTION, kOsAndroid,
1636 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherThemeColors)}, 1652 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherThemeColors)},
1637 #endif // defined(OS_ANDROID) 1653 #endif // defined(OS_ANDROID)
1638 #if defined(OS_ANDROID) 1654 #if defined(OS_ANDROID)
1639 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME, 1655 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME,
1640 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid, 1656 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid,
1641 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)}, 1657 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)},
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
2107 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2123 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2108 2124
2109 const FeatureEntry* GetFeatureEntries(size_t* count) { 2125 const FeatureEntry* GetFeatureEntries(size_t* count) {
2110 *count = arraysize(kFeatureEntries); 2126 *count = arraysize(kFeatureEntries);
2111 return kFeatureEntries; 2127 return kFeatureEntries;
2112 } 2128 }
2113 2129
2114 } // namespace testing 2130 } // namespace testing
2115 2131
2116 } // namespace about_flags 2132 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698