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

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: enum classes, et al. Created 4 years, 7 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 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 switches::kProgressBarAnimation, "disabled" }, 438 switches::kProgressBarAnimation, "disabled" },
439 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_LINEAR, 439 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_LINEAR,
440 switches::kProgressBarAnimation, "linear" }, 440 switches::kProgressBarAnimation, "linear" },
441 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH, 441 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH,
442 switches::kProgressBarAnimation, "smooth" }, 442 switches::kProgressBarAnimation, "smooth" },
443 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH_INDETERMINATE, 443 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH_INDETERMINATE,
444 switches::kProgressBarAnimation, "smooth-indeterminate" }, 444 switches::kProgressBarAnimation, "smooth-indeterminate" },
445 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START, 445 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START,
446 switches::kProgressBarAnimation, "fast-start" }, 446 switches::kProgressBarAnimation, "fast-start" },
447 }; 447 };
448
449 const FeatureEntry::Choice kProgressBarCompletionChoices[] = {
450 { IDS_FLAGS_PROGRESS_BAR_COMPLETION_LOAD_EVENT,
451 switches::kProgressBarCompletion, "loadEvent" },
452 { IDS_FLAGS_PROGRESS_BAR_COMPLETION_DCL_AND_IMAGES,
453 switches::kProgressBarCompletion, "domContentLoadedAndImages" },
454 { IDS_FLAGS_PROGRESS_BAR_COMPLETION_DOM_CONTENT_LOADED,
455 switches::kProgressBarCompletion, "domContentLoaded" },
456 };
457
448 #endif // defined(OS_ANDROID) 458 #endif // defined(OS_ANDROID)
449 459
450 #if defined(OS_CHROMEOS) 460 #if defined(OS_CHROMEOS)
451 const FeatureEntry::Choice kCrosRegionsModeChoices[] = { 461 const FeatureEntry::Choice kCrosRegionsModeChoices[] = {
452 { IDS_FLAGS_CROS_REGIONS_MODE_DEFAULT, "", "" }, 462 { IDS_FLAGS_CROS_REGIONS_MODE_DEFAULT, "", "" },
453 { IDS_FLAGS_CROS_REGIONS_MODE_OVERRIDE, chromeos::switches::kCrosRegionsMode, 463 { IDS_FLAGS_CROS_REGIONS_MODE_OVERRIDE, chromeos::switches::kCrosRegionsMode,
454 chromeos::switches::kCrosRegionsModeOverride }, 464 chromeos::switches::kCrosRegionsModeOverride },
455 { IDS_FLAGS_CROS_REGIONS_MODE_HIDE, chromeos::switches::kCrosRegionsMode, 465 { IDS_FLAGS_CROS_REGIONS_MODE_HIDE, chromeos::switches::kCrosRegionsMode,
456 chromeos::switches::kCrosRegionsModeHide }, 466 chromeos::switches::kCrosRegionsModeHide },
457 }; 467 };
(...skipping 1132 matching lines...) Expand 10 before | Expand all | Expand 10 after
1590 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, kOsAll, 1600 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, kOsAll,
1591 FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)}, 1601 FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)},
1592 {"experimental-keyboard-lock-ui", 1602 {"experimental-keyboard-lock-ui",
1593 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_NAME, 1603 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_NAME,
1594 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_DESCRIPTION, kOsDesktop, 1604 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_DESCRIPTION, kOsDesktop,
1595 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)}, 1605 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)},
1596 #if defined(OS_ANDROID) 1606 #if defined(OS_ANDROID)
1597 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, 1607 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME,
1598 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, 1608 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid,
1599 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, 1609 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)},
1610 {"progress-bar-completion", IDS_FLAGS_PROGRESS_BAR_COMPLETION_NAME,
1611 IDS_FLAGS_PROGRESS_BAR_COMPLETION_DESCRIPTION, kOsAndroid,
1612 MULTI_VALUE_TYPE(kProgressBarCompletionChoices)},
1600 #endif // defined(OS_ANDROID) 1613 #endif // defined(OS_ANDROID)
1601 #if defined(OS_ANDROID) 1614 #if defined(OS_ANDROID)
1602 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME, 1615 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME,
1603 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid, 1616 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid,
1604 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)}, 1617 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)},
1605 {"offline-pages-background-loading", 1618 {"offline-pages-background-loading",
1606 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_NAME, 1619 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_NAME,
1607 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_DESCRIPTION, kOsAndroid, 1620 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_DESCRIPTION, kOsAndroid,
1608 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesBackgroundLoadingFeature)}, 1621 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesBackgroundLoadingFeature)},
1609 #endif // defined(OS_ANDROID) 1622 #endif // defined(OS_ANDROID)
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
2062 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2075 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2063 2076
2064 const FeatureEntry* GetFeatureEntries(size_t* count) { 2077 const FeatureEntry* GetFeatureEntries(size_t* count) {
2065 *count = arraysize(kFeatureEntries); 2078 *count = arraysize(kFeatureEntries);
2066 return kFeatureEntries; 2079 return kFeatureEntries;
2067 } 2080 }
2068 2081
2069 } // namespace testing 2082 } // namespace testing
2070 2083
2071 } // namespace about_flags 2084 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698