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

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: Littering flags Created 4 years, 3 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/compositor/layer/tab_layer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1689 matching lines...) Expand 10 before | Expand all | Expand 10 after
1700 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)}, 1700 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)},
1701 #if defined(OS_ANDROID) 1701 #if defined(OS_ANDROID)
1702 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, 1702 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME,
1703 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, 1703 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid,
1704 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, 1704 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)},
1705 {"progress-bar-completion", IDS_FLAGS_PROGRESS_BAR_COMPLETION_NAME, 1705 {"progress-bar-completion", IDS_FLAGS_PROGRESS_BAR_COMPLETION_NAME,
1706 IDS_FLAGS_PROGRESS_BAR_COMPLETION_DESCRIPTION, kOsAndroid, 1706 IDS_FLAGS_PROGRESS_BAR_COMPLETION_DESCRIPTION, kOsAndroid,
1707 MULTI_VALUE_TYPE(kProgressBarCompletionChoices)}, 1707 MULTI_VALUE_TYPE(kProgressBarCompletionChoices)},
1708 #endif // defined(OS_ANDROID) 1708 #endif // defined(OS_ANDROID)
1709 #if defined(OS_ANDROID) 1709 #if defined(OS_ANDROID)
1710 {"tab-switcher-theme-colors", IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_NAME,
1711 IDS_FLAGS_TAB_SWITCHER_THEME_COLORS_DESCRIPTION, kOsAndroid,
1712 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherThemeColors)},
1713 #endif // defined(OS_ANDROID)
1714 #if defined(OS_ANDROID)
1715 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME, 1710 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME,
1716 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid, 1711 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid,
1717 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)}, 1712 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)},
1718 {"offline-pages-background-loading", 1713 {"offline-pages-background-loading",
1719 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_NAME, 1714 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_NAME,
1720 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_DESCRIPTION, kOsAndroid, 1715 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_DESCRIPTION, kOsAndroid,
1721 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesBackgroundLoadingFeature)}, 1716 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesBackgroundLoadingFeature)},
1722 {"offline-pages-sharing", IDS_FLAGS_OFFLINE_PAGES_SHARING_NAME, 1717 {"offline-pages-sharing", IDS_FLAGS_OFFLINE_PAGES_SHARING_NAME,
1723 IDS_FLAGS_OFFLINE_PAGES_SHARING_DESCRIPTION, kOsAndroid, 1718 IDS_FLAGS_OFFLINE_PAGES_SHARING_DESCRIPTION, kOsAndroid,
1724 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesSharingFeature)}, 1719 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesSharingFeature)},
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
2264 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2259 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2265 2260
2266 const FeatureEntry* GetFeatureEntries(size_t* count) { 2261 const FeatureEntry* GetFeatureEntries(size_t* count) {
2267 *count = arraysize(kFeatureEntries); 2262 *count = arraysize(kFeatureEntries);
2268 return kFeatureEntries; 2263 return kFeatureEntries;
2269 } 2264 }
2270 2265
2271 } // namespace testing 2266 } // namespace testing
2272 2267
2273 } // namespace about_flags 2268 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/compositor/layer/tab_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698