| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index b1eeff8ebf7cf21a1279192e7791300ca1f6a3b4..38df8abd75a8426212ea0af5b7f67958183b5261 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -459,6 +459,19 @@ const FeatureEntry::Choice kProgressBarAnimationChoices[] = {
|
| { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START,
|
| switches::kProgressBarAnimation, "fast-start" },
|
| };
|
| +
|
| +const FeatureEntry::Choice kProgressBarCompletionChoices[] = {
|
| + {IDS_FLAGS_PROGRESS_BAR_COMPLETION_LOAD_EVENT,
|
| + switches::kProgressBarCompletion, "loadEvent"},
|
| + {IDS_FLAGS_PROGRESS_BAR_COMPLETION_RESOURCES_BEFORE_DCL,
|
| + switches::kProgressBarCompletion, "resourcesBeforeDOMContentLoaded"},
|
| + {IDS_FLAGS_PROGRESS_BAR_COMPLETION_DOM_CONTENT_LOADED,
|
| + switches::kProgressBarCompletion, "domContentLoaded"},
|
| + {IDS_FLAGS_PROGRESS_BAR_COMPLETION_RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRAMES,
|
| + switches::kProgressBarCompletion,
|
| + "resourcesBeforeDOMContentLoadedAndSameOriginIFrames"},
|
| +};
|
| +
|
| #endif // defined(OS_ANDROID)
|
|
|
| #if defined(OS_CHROMEOS)
|
| @@ -1611,6 +1624,9 @@ const FeatureEntry kFeatureEntries[] = {
|
| {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME,
|
| IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid,
|
| MULTI_VALUE_TYPE(kProgressBarAnimationChoices)},
|
| + {"progress-bar-completion", IDS_FLAGS_PROGRESS_BAR_COMPLETION_NAME,
|
| + IDS_FLAGS_PROGRESS_BAR_COMPLETION_DESCRIPTION, kOsAndroid,
|
| + MULTI_VALUE_TYPE(kProgressBarCompletionChoices)},
|
| #endif // defined(OS_ANDROID)
|
| #if defined(OS_ANDROID)
|
| {"tab-switcher-theme-colors", IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_NAME,
|
|
|