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

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

Issue 684223003: Data Reduction Proxy Interstitials (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 1 month 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 1989 matching lines...) Expand 10 before | Expand all | Expand 10 after
2000 #endif 2000 #endif
2001 #if defined(OS_CHROMEOS) 2001 #if defined(OS_CHROMEOS)
2002 { 2002 {
2003 "enable-remote-assistance", 2003 "enable-remote-assistance",
2004 IDS_FLAGS_ENABLE_REMOTE_ASSISTANCE_NAME, 2004 IDS_FLAGS_ENABLE_REMOTE_ASSISTANCE_NAME,
2005 IDS_FLAGS_ENABLE_REMOTE_ASSISTANCE_DESCRIPTION, 2005 IDS_FLAGS_ENABLE_REMOTE_ASSISTANCE_DESCRIPTION,
2006 kOsCrOS, 2006 kOsCrOS,
2007 SINGLE_VALUE_TYPE(extensions::switches::kEnableRemoteAssistance) 2007 SINGLE_VALUE_TYPE(extensions::switches::kEnableRemoteAssistance)
2008 }, 2008 },
2009 #endif // defined(OS_CHROMEOS) 2009 #endif // defined(OS_CHROMEOS)
2010 #if defined(OS_ANDROID)
bengr 2014/10/31 17:06:47 Please also limit this to Chromium builds and Dev
megjablon 2014/12/11 23:32:03 Done.
2011 {
2012 "enable-data-reduction-proxy-bypass-warning",
2013 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_BYPASS_WARNING_NAME,
2014 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_BYPASS_WARNING_DESCRIPTION,
2015 kOsAndroid,
2016 SINGLE_VALUE_TYPE(data_reduction_proxy::switches::
2017 kEnableDataReductionProxyBypassWarning)
2018 },
2019 #endif // OS_ANDROID
2010 // NOTE: Adding new command-line switches requires adding corresponding 2020 // NOTE: Adding new command-line switches requires adding corresponding
2011 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2021 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2012 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2022 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2013 }; 2023 };
2014 2024
2015 const Experiment* experiments = kExperiments; 2025 const Experiment* experiments = kExperiments;
2016 size_t num_experiments = arraysize(kExperiments); 2026 size_t num_experiments = arraysize(kExperiments);
2017 2027
2018 // Stores and encapsulates the little state that about:flags has. 2028 // Stores and encapsulates the little state that about:flags has.
2019 class FlagsState { 2029 class FlagsState {
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
2601 } 2611 }
2602 2612
2603 const Experiment* GetExperiments(size_t* count) { 2613 const Experiment* GetExperiments(size_t* count) {
2604 *count = num_experiments; 2614 *count = num_experiments;
2605 return experiments; 2615 return experiments;
2606 } 2616 }
2607 2617
2608 } // namespace testing 2618 } // namespace testing
2609 2619
2610 } // namespace about_flags 2620 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698