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

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: 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 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 switches::kProgressBarAnimation, "disabled" }, 427 switches::kProgressBarAnimation, "disabled" },
428 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_LINEAR, 428 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_LINEAR,
429 switches::kProgressBarAnimation, "linear" }, 429 switches::kProgressBarAnimation, "linear" },
430 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH, 430 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH,
431 switches::kProgressBarAnimation, "smooth" }, 431 switches::kProgressBarAnimation, "smooth" },
432 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH_INDETERMINATE, 432 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH_INDETERMINATE,
433 switches::kProgressBarAnimation, "smooth-indeterminate" }, 433 switches::kProgressBarAnimation, "smooth-indeterminate" },
434 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START, 434 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START,
435 switches::kProgressBarAnimation, "fast-start" }, 435 switches::kProgressBarAnimation, "fast-start" },
436 }; 436 };
437
438 const FeatureEntry::Choice kProgressBarCompletionChoices[] = {
439 { IDS_FLAGS_PROGRESS_BAR_COMPLETION_LOAD_EVENT,
440 switches::kProgressBarCompletion, "loadEvent" },
441 { IDS_FLAGS_PROGRESS_BAR_COMPLETION_DCL_AND_IMAGES,
442 switches::kProgressBarCompletion, "dclAndImages" },
443 { IDS_FLAGS_PROGRESS_BAR_COMPLETION_DOM_CONTENT_LOADED,
444 switches::kProgressBarCompletion, "domContentLoaded" },
445 };
446
437 #endif // defined(OS_ANDROID) 447 #endif // defined(OS_ANDROID)
438 448
439 #if defined(OS_CHROMEOS) 449 #if defined(OS_CHROMEOS)
440 const FeatureEntry::Choice kCrosRegionsModeChoices[] = { 450 const FeatureEntry::Choice kCrosRegionsModeChoices[] = {
441 { IDS_FLAGS_CROS_REGIONS_MODE_DEFAULT, "", "" }, 451 { IDS_FLAGS_CROS_REGIONS_MODE_DEFAULT, "", "" },
442 { IDS_FLAGS_CROS_REGIONS_MODE_OVERRIDE, chromeos::switches::kCrosRegionsMode, 452 { IDS_FLAGS_CROS_REGIONS_MODE_OVERRIDE, chromeos::switches::kCrosRegionsMode,
443 chromeos::switches::kCrosRegionsModeOverride }, 453 chromeos::switches::kCrosRegionsModeOverride },
444 { IDS_FLAGS_CROS_REGIONS_MODE_HIDE, chromeos::switches::kCrosRegionsMode, 454 { IDS_FLAGS_CROS_REGIONS_MODE_HIDE, chromeos::switches::kCrosRegionsMode,
445 chromeos::switches::kCrosRegionsModeHide }, 455 chromeos::switches::kCrosRegionsModeHide },
446 }; 456 };
(...skipping 1114 matching lines...) Expand 10 before | Expand all | Expand 10 after
1561 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, kOsAll, 1571 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, kOsAll,
1562 FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)}, 1572 FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)},
1563 {"experimental-keyboard-lock-ui", 1573 {"experimental-keyboard-lock-ui",
1564 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_NAME, 1574 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_NAME,
1565 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_DESCRIPTION, kOsDesktop, 1575 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_DESCRIPTION, kOsDesktop,
1566 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)}, 1576 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)},
1567 #if defined(OS_ANDROID) 1577 #if defined(OS_ANDROID)
1568 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, 1578 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME,
1569 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, 1579 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid,
1570 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, 1580 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)},
1581 {"progress-bar-completion", IDS_FLAGS_PROGRESS_BAR_COMPLETION_NAME,
1582 IDS_FLAGS_PROGRESS_BAR_COMPLETION_DESCRIPTION, kOsAndroid,
1583 MULTI_VALUE_TYPE(kProgressBarCompletionChoices)},
1571 #endif // defined(OS_ANDROID) 1584 #endif // defined(OS_ANDROID)
1572 #if defined(OS_ANDROID) 1585 #if defined(OS_ANDROID)
1573 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME, 1586 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME,
1574 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid, 1587 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid,
1575 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)}, 1588 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)},
1576 {"offline-pages-background-loading", 1589 {"offline-pages-background-loading",
1577 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_NAME, 1590 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_NAME,
1578 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_DESCRIPTION, kOsAndroid, 1591 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_DESCRIPTION, kOsAndroid,
1579 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesBackgroundLoadingFeature)}, 1592 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesBackgroundLoadingFeature)},
1580 #endif // defined(OS_ANDROID) 1593 #endif // defined(OS_ANDROID)
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
2024 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2037 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2025 2038
2026 const FeatureEntry* GetFeatureEntries(size_t* count) { 2039 const FeatureEntry* GetFeatureEntries(size_t* count) {
2027 *count = arraysize(kFeatureEntries); 2040 *count = arraysize(kFeatureEntries);
2028 return kFeatureEntries; 2041 return kFeatureEntries;
2029 } 2042 }
2030 2043
2031 } // namespace testing 2044 } // namespace testing
2032 2045
2033 } // namespace about_flags 2046 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698