| 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 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 "application/x-google-chrome-pdf,application/pdf"}, | 502 "application/x-google-chrome-pdf,application/pdf"}, |
| 503 {IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_FLASH_AND_PDF, | 503 {IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_FLASH_AND_PDF, |
| 504 switches::kEnableWin32kLockDownMimeTypes, | 504 switches::kEnableWin32kLockDownMimeTypes, |
| 505 "application/x-shockwave-flash,application/futuresplash," | 505 "application/x-shockwave-flash,application/futuresplash," |
| 506 "application/x-google-chrome-pdf,application/pdf"}, | 506 "application/x-google-chrome-pdf,application/pdf"}, |
| 507 {IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_ALL, | 507 {IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_ALL, |
| 508 switches::kEnableWin32kLockDownMimeTypes, "*"}, | 508 switches::kEnableWin32kLockDownMimeTypes, "*"}, |
| 509 }; | 509 }; |
| 510 #endif // defined(OS_WIN) | 510 #endif // defined(OS_WIN) |
| 511 | 511 |
| 512 #if defined(OS_ANDROID) |
| 513 const FeatureEntry::Choice kNtpSwitchToExistingTabChoices[] = { |
| 514 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, |
| 515 {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kNtpSwitchToExistingTab, |
| 516 "disabled"}, |
| 517 {IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_MATCH_URL, |
| 518 switches::kNtpSwitchToExistingTab, "url"}, |
| 519 {IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_MATCH_HOST, |
| 520 switches::kNtpSwitchToExistingTab, "host"}, |
| 521 }; |
| 522 #endif // defined(OS_ANDROID) |
| 523 |
| 512 // RECORDING USER METRICS FOR FLAGS: | 524 // RECORDING USER METRICS FOR FLAGS: |
| 513 // ----------------------------------------------------------------------------- | 525 // ----------------------------------------------------------------------------- |
| 514 // The first line of the entry is the internal name. If you'd like to gather | 526 // The first line of the entry is the internal name. If you'd like to gather |
| 515 // statistics about the usage of your flag, you should append a marker comment | 527 // statistics about the usage of your flag, you should append a marker comment |
| 516 // to the end of the feature name, like so: | 528 // to the end of the feature name, like so: |
| 517 // "my-special-feature", // FLAGS:RECORD_UMA | 529 // "my-special-feature", // FLAGS:RECORD_UMA |
| 518 // | 530 // |
| 519 // After doing that, run | 531 // After doing that, run |
| 520 // tools/metrics/actions/extract_actions.py | 532 // tools/metrics/actions/extract_actions.py |
| 521 // to add the metric to actions.xml (which will enable UMA to record your | 533 // to add the metric to actions.xml (which will enable UMA to record your |
| (...skipping 1458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1980 // merge the flag values. | 1992 // merge the flag values. |
| 1981 SINGLE_VALUE_TYPE_AND_VALUE( | 1993 SINGLE_VALUE_TYPE_AND_VALUE( |
| 1982 switches::kBlinkSettings, "lowPriorityIframes=true")}, | 1994 switches::kBlinkSettings, "lowPriorityIframes=true")}, |
| 1983 #if defined(OS_ANDROID) | 1995 #if defined(OS_ANDROID) |
| 1984 {"enable-ntp-popular-sites", | 1996 {"enable-ntp-popular-sites", |
| 1985 IDS_FLAGS_NTP_POPULAR_SITES_NAME, | 1997 IDS_FLAGS_NTP_POPULAR_SITES_NAME, |
| 1986 IDS_FLAGS_NTP_POPULAR_SITES_DESCRIPTION, | 1998 IDS_FLAGS_NTP_POPULAR_SITES_DESCRIPTION, |
| 1987 kOsAndroid, | 1999 kOsAndroid, |
| 1988 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites, | 2000 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites, |
| 1989 switches::kDisableNTPPopularSites)}, | 2001 switches::kDisableNTPPopularSites)}, |
| 2002 {"ntp-switch-to-existing-tab", |
| 2003 IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_NAME, |
| 2004 IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_DESCRIPTION, |
| 2005 kOsAndroid, |
| 2006 MULTI_VALUE_TYPE(kNtpSwitchToExistingTabChoices)}, |
| 1990 {"use-android-midi-api", | 2007 {"use-android-midi-api", |
| 1991 IDS_FLAGS_USE_ANDROID_MIDI_API_NAME, | 2008 IDS_FLAGS_USE_ANDROID_MIDI_API_NAME, |
| 1992 IDS_FLAGS_USE_ANDROID_MIDI_API_DESCRIPTION, | 2009 IDS_FLAGS_USE_ANDROID_MIDI_API_DESCRIPTION, |
| 1993 kOsAndroid, | 2010 kOsAndroid, |
| 1994 SINGLE_VALUE_TYPE(switches::kUseAndroidMidiApi)}, | 2011 SINGLE_VALUE_TYPE(switches::kUseAndroidMidiApi)}, |
| 1995 #endif // defined(OS_ANDROID) | 2012 #endif // defined(OS_ANDROID) |
| 1996 #if defined(OS_WIN) | 2013 #if defined(OS_WIN) |
| 1997 {"trace-export-events-to-etw", | 2014 {"trace-export-events-to-etw", |
| 1998 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_NAME, | 2015 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_NAME, |
| 1999 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_DESRIPTION, | 2016 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_DESRIPTION, |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2284 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2301 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2285 | 2302 |
| 2286 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2303 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2287 *count = arraysize(kFeatureEntries); | 2304 *count = arraysize(kFeatureEntries); |
| 2288 return kFeatureEntries; | 2305 return kFeatureEntries; |
| 2289 } | 2306 } |
| 2290 | 2307 |
| 2291 } // namespace testing | 2308 } // namespace testing |
| 2292 | 2309 |
| 2293 } // namespace about_flags | 2310 } // namespace about_flags |
| OLD | NEW |