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

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

Issue 1265983007: Popular sites on the NTP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/most_visited_sites.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 2099 matching lines...) Expand 10 before | Expand all | Expand 10 after
2110 #endif // defined(OS_ANDROID) 2110 #endif // defined(OS_ANDROID)
2111 {"low-priority-iframes", 2111 {"low-priority-iframes",
2112 IDS_FLAGS_LOW_PRIORITY_IFRAMES_UI_NAME, 2112 IDS_FLAGS_LOW_PRIORITY_IFRAMES_UI_NAME,
2113 IDS_FLAGS_LOW_PRIORITY_IFRAMES_UI_DESCRIPTION, 2113 IDS_FLAGS_LOW_PRIORITY_IFRAMES_UI_DESCRIPTION,
2114 kOsAll, 2114 kOsAll,
2115 // NOTE: if we want to add additional experiment entries for other 2115 // NOTE: if we want to add additional experiment entries for other
2116 // features controlled by kBlinkSettings, we'll need to add logic to 2116 // features controlled by kBlinkSettings, we'll need to add logic to
2117 // merge the flag values. 2117 // merge the flag values.
2118 SINGLE_VALUE_TYPE_AND_VALUE( 2118 SINGLE_VALUE_TYPE_AND_VALUE(
2119 switches::kBlinkSettings, "lowPriorityIframes=true")}, 2119 switches::kBlinkSettings, "lowPriorityIframes=true")},
2120 2120 #if defined(OS_ANDROID)
2121 {"enable-ntp-popular-sites",
2122 IDS_FLAGS_NTP_POPULAR_SITES_NAME,
2123 IDS_FLAGS_NTP_POPULAR_SITES_DESCRIPTION,
2124 kOsAndroid,
2125 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites,
2126 switches::kDisableNTPPopularSites)},
2127 #endif // defined(OS_ANDROID)
2121 // NOTE: Adding new command-line switches requires adding corresponding 2128 // NOTE: Adding new command-line switches requires adding corresponding
2122 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2129 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2123 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2130 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2124 }; 2131 };
2125 2132
2126 const Experiment* experiments = kExperiments; 2133 const Experiment* experiments = kExperiments;
2127 size_t num_experiments = arraysize(kExperiments); 2134 size_t num_experiments = arraysize(kExperiments);
2128 2135
2129 // Stores and encapsulates the little state that about:flags has. 2136 // Stores and encapsulates the little state that about:flags has.
2130 class FlagsState { 2137 class FlagsState {
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
2753 } 2760 }
2754 2761
2755 const Experiment* GetExperiments(size_t* count) { 2762 const Experiment* GetExperiments(size_t* count) {
2756 *count = num_experiments; 2763 *count = num_experiments;
2757 return experiments; 2764 return experiments;
2758 } 2765 }
2759 2766
2760 } // namespace testing 2767 } // namespace testing
2761 2768
2762 } // namespace about_flags 2769 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/most_visited_sites.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698