| 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 458 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 469 #if defined(OS_CHROMEOS) | 469 #if defined(OS_CHROMEOS) | 
| 470 const FeatureEntry::Choice kCrosRegionsModeChoices[] = { | 470 const FeatureEntry::Choice kCrosRegionsModeChoices[] = { | 
| 471   { IDS_FLAGS_CROS_REGIONS_MODE_DEFAULT, "", "" }, | 471   { IDS_FLAGS_CROS_REGIONS_MODE_DEFAULT, "", "" }, | 
| 472   { IDS_FLAGS_CROS_REGIONS_MODE_OVERRIDE, chromeos::switches::kCrosRegionsMode, | 472   { IDS_FLAGS_CROS_REGIONS_MODE_OVERRIDE, chromeos::switches::kCrosRegionsMode, | 
| 473         chromeos::switches::kCrosRegionsModeOverride }, | 473         chromeos::switches::kCrosRegionsModeOverride }, | 
| 474   { IDS_FLAGS_CROS_REGIONS_MODE_HIDE, chromeos::switches::kCrosRegionsMode, | 474   { IDS_FLAGS_CROS_REGIONS_MODE_HIDE, chromeos::switches::kCrosRegionsMode, | 
| 475         chromeos::switches::kCrosRegionsModeHide }, | 475         chromeos::switches::kCrosRegionsModeHide }, | 
| 476 }; | 476 }; | 
| 477 #endif  // OS_CHROMEOS | 477 #endif  // OS_CHROMEOS | 
| 478 | 478 | 
| 479 #if defined(OS_WIN) |  | 
| 480 const FeatureEntry::Choice kPpapiWin32kLockdown[] = { |  | 
| 481     {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, |  | 
| 482     {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |  | 
| 483      switches::kEnableWin32kLockDownMimeTypes, ""}, |  | 
| 484     {IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_FLASH_ONLY, |  | 
| 485      switches::kEnableWin32kLockDownMimeTypes, |  | 
| 486      "application/x-shockwave-flash,application/futuresplash"}, |  | 
| 487     {IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_PDF_ONLY, |  | 
| 488      switches::kEnableWin32kLockDownMimeTypes, |  | 
| 489      "application/x-google-chrome-pdf,application/pdf"}, |  | 
| 490     {IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_FLASH_AND_PDF, |  | 
| 491      switches::kEnableWin32kLockDownMimeTypes, |  | 
| 492      "application/x-shockwave-flash,application/futuresplash," |  | 
| 493      "application/x-google-chrome-pdf,application/pdf"}, |  | 
| 494     {IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_ALL, |  | 
| 495      switches::kEnableWin32kLockDownMimeTypes, "*"}, |  | 
| 496 }; |  | 
| 497 #endif  // OS_WIN |  | 
| 498 |  | 
| 499 const FeatureEntry::Choice kForceUIDirectionChoices[] = { | 479 const FeatureEntry::Choice kForceUIDirectionChoices[] = { | 
| 500     {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, | 480     {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, | 
| 501     {IDS_FLAGS_FORCE_UI_DIRECTION_LTR, switches::kForceUIDirection, | 481     {IDS_FLAGS_FORCE_UI_DIRECTION_LTR, switches::kForceUIDirection, | 
| 502      switches::kForceUIDirectionLTR}, | 482      switches::kForceUIDirectionLTR}, | 
| 503     {IDS_FLAGS_FORCE_UI_DIRECTION_RTL, switches::kForceUIDirection, | 483     {IDS_FLAGS_FORCE_UI_DIRECTION_RTL, switches::kForceUIDirection, | 
| 504      switches::kForceUIDirectionRTL}, | 484      switches::kForceUIDirectionRTL}, | 
| 505 }; | 485 }; | 
| 506 | 486 | 
| 507 #if defined(OS_ANDROID) | 487 #if defined(OS_ANDROID) | 
| 508 const FeatureEntry::Choice kNtpSwitchToExistingTabChoices[] = { | 488 const FeatureEntry::Choice kNtpSwitchToExistingTabChoices[] = { | 
| (...skipping 1197 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1706     {"enable-push-api-background-mode", IDS_FLAGS_PUSH_API_BACKGROUND_MODE_NAME, | 1686     {"enable-push-api-background-mode", IDS_FLAGS_PUSH_API_BACKGROUND_MODE_NAME, | 
| 1707      IDS_FLAGS_PUSH_API_BACKGROUND_MODE_DESCRIPTION, kOsMac | kOsWin | kOsLinux, | 1687      IDS_FLAGS_PUSH_API_BACKGROUND_MODE_DESCRIPTION, kOsMac | kOsWin | kOsLinux, | 
| 1708      ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePushApiBackgroundMode, | 1688      ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePushApiBackgroundMode, | 
| 1709                                switches::kDisablePushApiBackgroundMode)}, | 1689                                switches::kDisablePushApiBackgroundMode)}, | 
| 1710 #endif  // BUILDFLAG(ENABLE_BACKGROUND) | 1690 #endif  // BUILDFLAG(ENABLE_BACKGROUND) | 
| 1711 #if defined(OS_CHROMEOS) | 1691 #if defined(OS_CHROMEOS) | 
| 1712     {"cros-regions-mode", IDS_FLAGS_CROS_REGIONS_MODE_NAME, | 1692     {"cros-regions-mode", IDS_FLAGS_CROS_REGIONS_MODE_NAME, | 
| 1713      IDS_FLAGS_CROS_REGIONS_MODE_DESCRIPTION, kOsCrOS, | 1693      IDS_FLAGS_CROS_REGIONS_MODE_DESCRIPTION, kOsCrOS, | 
| 1714      MULTI_VALUE_TYPE(kCrosRegionsModeChoices)}, | 1694      MULTI_VALUE_TYPE(kCrosRegionsModeChoices)}, | 
| 1715 #endif  // OS_CHROMEOS | 1695 #endif  // OS_CHROMEOS | 
| 1716 #if defined(OS_WIN) |  | 
| 1717     {"enable-ppapi-win32k-lockdown", IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_NAME, |  | 
| 1718      IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_DESCRIPTION, kOsWin, |  | 
| 1719      MULTI_VALUE_TYPE(kPpapiWin32kLockdown)}, |  | 
| 1720 #endif  // OS_WIN |  | 
| 1721 #if defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) | 1696 #if defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) | 
| 1722     {"enable-web-notification-custom-layouts", | 1697     {"enable-web-notification-custom-layouts", | 
| 1723      IDS_FLAGS_ENABLE_WEB_NOTIFICATION_CUSTOM_LAYOUTS_NAME, | 1698      IDS_FLAGS_ENABLE_WEB_NOTIFICATION_CUSTOM_LAYOUTS_NAME, | 
| 1724      IDS_FLAGS_ENABLE_WEB_NOTIFICATION_CUSTOM_LAYOUTS_DESCRIPTION, kOsAndroid, | 1699      IDS_FLAGS_ENABLE_WEB_NOTIFICATION_CUSTOM_LAYOUTS_DESCRIPTION, kOsAndroid, | 
| 1725      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, | 1700      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, | 
| 1726                                switches::kDisableWebNotificationCustomLayouts)}, | 1701                                switches::kDisableWebNotificationCustomLayouts)}, | 
| 1727 #endif  // ENABLE_NOTIFICATIONS) && defined(OS_ANDROID | 1702 #endif  // ENABLE_NOTIFICATIONS) && defined(OS_ANDROID | 
| 1728 #if defined(OS_WIN) | 1703 #if defined(OS_WIN) | 
| 1729     {"enable-appcontainer", IDS_FLAGS_ENABLE_APPCONTAINER_NAME, | 1704     {"enable-appcontainer", IDS_FLAGS_ENABLE_APPCONTAINER_NAME, | 
| 1730      IDS_FLAGS_ENABLE_APPCONTAINER_DESCRIPTION, kOsWin, | 1705      IDS_FLAGS_ENABLE_APPCONTAINER_DESCRIPTION, kOsWin, | 
| (...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2269 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2244 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 
| 2270 | 2245 | 
| 2271 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2246 const FeatureEntry* GetFeatureEntries(size_t* count) { | 
| 2272   *count = arraysize(kFeatureEntries); | 2247   *count = arraysize(kFeatureEntries); | 
| 2273   return kFeatureEntries; | 2248   return kFeatureEntries; | 
| 2274 } | 2249 } | 
| 2275 | 2250 | 
| 2276 }  // namespace testing | 2251 }  // namespace testing | 
| 2277 | 2252 | 
| 2278 }  // namespace about_flags | 2253 }  // namespace about_flags | 
| OLD | NEW | 
|---|