OLD | NEW |
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 1980 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1991 }, | 1991 }, |
1992 #endif | 1992 #endif |
1993 #if defined(OS_CHROMEOS) | 1993 #if defined(OS_CHROMEOS) |
1994 { | 1994 { |
1995 "enable-remote-assistance", | 1995 "enable-remote-assistance", |
1996 IDS_FLAGS_ENABLE_REMOTE_ASSISTANCE_NAME, | 1996 IDS_FLAGS_ENABLE_REMOTE_ASSISTANCE_NAME, |
1997 IDS_FLAGS_ENABLE_REMOTE_ASSISTANCE_DESCRIPTION, | 1997 IDS_FLAGS_ENABLE_REMOTE_ASSISTANCE_DESCRIPTION, |
1998 kOsCrOS, | 1998 kOsCrOS, |
1999 SINGLE_VALUE_TYPE(extensions::switches::kEnableRemoteAssistance) | 1999 SINGLE_VALUE_TYPE(extensions::switches::kEnableRemoteAssistance) |
2000 }, | 2000 }, |
| 2001 { |
| 2002 "disable-new-zip-unpacker", |
| 2003 IDS_FLAGS_DISABLE_NEW_ZIP_UNPACKER_NAME, |
| 2004 IDS_FLAGS_DISABLE_NEW_ZIP_UNPACKER_DESCRIPTION, |
| 2005 kOsCrOS, |
| 2006 SINGLE_VALUE_TYPE(chromeos::switches::kDisableNewZIPUnpacker) |
| 2007 } |
2001 #endif // defined(OS_CHROMEOS) | 2008 #endif // defined(OS_CHROMEOS) |
2002 // NOTE: Adding new command-line switches requires adding corresponding | 2009 // NOTE: Adding new command-line switches requires adding corresponding |
2003 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2010 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2004 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2011 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2005 }; | 2012 }; |
2006 | 2013 |
2007 const Experiment* experiments = kExperiments; | 2014 const Experiment* experiments = kExperiments; |
2008 size_t num_experiments = arraysize(kExperiments); | 2015 size_t num_experiments = arraysize(kExperiments); |
2009 | 2016 |
2010 // Stores and encapsulates the little state that about:flags has. | 2017 // Stores and encapsulates the little state that about:flags has. |
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2593 } | 2600 } |
2594 | 2601 |
2595 const Experiment* GetExperiments(size_t* count) { | 2602 const Experiment* GetExperiments(size_t* count) { |
2596 *count = num_experiments; | 2603 *count = num_experiments; |
2597 return experiments; | 2604 return experiments; |
2598 } | 2605 } |
2599 | 2606 |
2600 } // namespace testing | 2607 } // namespace testing |
2601 | 2608 |
2602 } // namespace about_flags | 2609 } // namespace about_flags |
OLD | NEW |