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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 2163393003: Tab switcher theme colors no longer behind flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 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 1664 matching lines...) Expand 10 before | Expand all | Expand 10 after
1675 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)}, 1675 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)},
1676 #if defined(OS_ANDROID) 1676 #if defined(OS_ANDROID)
1677 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, 1677 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME,
1678 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, 1678 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid,
1679 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, 1679 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)},
1680 {"progress-bar-completion", IDS_FLAGS_PROGRESS_BAR_COMPLETION_NAME, 1680 {"progress-bar-completion", IDS_FLAGS_PROGRESS_BAR_COMPLETION_NAME,
1681 IDS_FLAGS_PROGRESS_BAR_COMPLETION_DESCRIPTION, kOsAndroid, 1681 IDS_FLAGS_PROGRESS_BAR_COMPLETION_DESCRIPTION, kOsAndroid,
1682 MULTI_VALUE_TYPE(kProgressBarCompletionChoices)}, 1682 MULTI_VALUE_TYPE(kProgressBarCompletionChoices)},
1683 #endif // defined(OS_ANDROID) 1683 #endif // defined(OS_ANDROID)
1684 #if defined(OS_ANDROID) 1684 #if defined(OS_ANDROID)
1685 {"tab-switcher-theme-colors", IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_NAME,
1686 IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_DESCRIPTION, kOsAndroid,
1687 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherThemeColors)},
1688 #endif // defined(OS_ANDROID)
1689 #if defined(OS_ANDROID)
1690 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME, 1685 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME,
1691 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid, 1686 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid,
1692 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)}, 1687 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)},
1693 {"offline-pages-background-loading", 1688 {"offline-pages-background-loading",
1694 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_NAME, 1689 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_NAME,
1695 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_DESCRIPTION, kOsAndroid, 1690 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_DESCRIPTION, kOsAndroid,
1696 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesBackgroundLoadingFeature)}, 1691 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesBackgroundLoadingFeature)},
1697 {"offline-pages-sharing", IDS_FLAGS_OFFLINE_PAGES_SHARING_NAME, 1692 {"offline-pages-sharing", IDS_FLAGS_OFFLINE_PAGES_SHARING_NAME,
1698 IDS_FLAGS_OFFLINE_PAGES_SHARING_DESCRIPTION, kOsAndroid, 1693 IDS_FLAGS_OFFLINE_PAGES_SHARING_DESCRIPTION, kOsAndroid,
1699 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesSharingFeature)}, 1694 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesSharingFeature)},
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
2212 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2207 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2213 2208
2214 const FeatureEntry* GetFeatureEntries(size_t* count) { 2209 const FeatureEntry* GetFeatureEntries(size_t* count) {
2215 *count = arraysize(kFeatureEntries); 2210 *count = arraysize(kFeatureEntries);
2216 return kFeatureEntries; 2211 return kFeatureEntries;
2217 } 2212 }
2218 2213
2219 } // namespace testing 2214 } // namespace testing
2220 2215
2221 } // namespace about_flags 2216 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698