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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/about_flags.cc

Issue 1947393004: add translate::kTranslateUI2016Q2 to chrome://flags page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 30b44c61e23a654c1718c36f74337c3632e80590..b91a4c0c4c91aa6d92b7258ed446ab30f73f4ae0 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -54,6 +54,7 @@
#include "components/signin/core/common/signin_switches.h"
#include "components/sync_driver/sync_driver_switches.h"
#include "components/tracing/tracing_switches.h"
+#include "components/translate/core/browser/translate_prefs.h"
#include "components/version_info/version_info.h"
#include "content/public/browser/user_metrics.h"
#include "content/public/common/content_features.h"
@@ -126,62 +127,52 @@ const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid;
const unsigned kOsDesktop = kOsMac | kOsWin | kOsLinux | kOsCrOS;
const FeatureEntry::Choice kTouchEventsChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" },
- { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
- switches::kTouchEvents,
- switches::kTouchEventsEnabled },
- { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
- switches::kTouchEvents,
- switches::kTouchEventsDisabled }
-};
+ {IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", ""},
+ {IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, switches::kTouchEvents,
groby-ooo-7-16 2016/05/05 22:44:34 Please undo the auto-formatting in unrelated entri
+ switches::kTouchEventsEnabled},
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kTouchEvents,
+ switches::kTouchEventsDisabled}};
#if defined(USE_AURA)
const FeatureEntry::Choice kOverscrollHistoryNavigationChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" },
- { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
- switches::kOverscrollHistoryNavigation,
- "0" },
- { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI,
- switches::kOverscrollHistoryNavigation,
- "2" }
-};
+ {IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", ""},
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
+ switches::kOverscrollHistoryNavigation, "0"},
+ {IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI,
+ switches::kOverscrollHistoryNavigation, "2"}};
#endif
const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_TOUCH_SELECTION_STRATEGY_CHARACTER,
- switches::kTouchTextSelectionStrategy,
- "character" },
- { IDS_TOUCH_SELECTION_STRATEGY_DIRECTION,
- switches::kTouchTextSelectionStrategy,
- "direction" }
-};
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_TOUCH_SELECTION_STRATEGY_CHARACTER,
+ switches::kTouchTextSelectionStrategy, "character"},
+ {IDS_TOUCH_SELECTION_STRATEGY_DIRECTION,
+ switches::kTouchTextSelectionStrategy, "direction"}};
const FeatureEntry::Choice kTraceUploadURL[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, "", "" },
- { IDS_TRACE_UPLOAD_URL_CHOICE_OTHER, switches::kTraceUploadURL,
- "https://performance-insights.appspot.com/upload?tags=flags,Other"},
- { IDS_TRACE_UPLOAD_URL_CHOICE_EMLOADING, switches::kTraceUploadURL,
- "https://performance-insights.appspot.com/upload?tags=flags,emloading" },
- { IDS_TRACE_UPLOAD_URL_CHOICE_QA, switches::kTraceUploadURL,
- "https://performance-insights.appspot.com/upload?tags=flags,QA" },
- { IDS_TRACE_UPLOAD_URL_CHOICE_TESTING, switches::kTraceUploadURL,
- "https://performance-insights.appspot.com/upload?tags=flags,TestingTeam" }
-};
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, "", ""},
+ {IDS_TRACE_UPLOAD_URL_CHOICE_OTHER, switches::kTraceUploadURL,
+ "https://performance-insights.appspot.com/upload?tags=flags,Other"},
+ {IDS_TRACE_UPLOAD_URL_CHOICE_EMLOADING, switches::kTraceUploadURL,
+ "https://performance-insights.appspot.com/upload?tags=flags,emloading"},
+ {IDS_TRACE_UPLOAD_URL_CHOICE_QA, switches::kTraceUploadURL,
+ "https://performance-insights.appspot.com/upload?tags=flags,QA"},
+ {IDS_TRACE_UPLOAD_URL_CHOICE_TESTING, switches::kTraceUploadURL,
+ "https://performance-insights.appspot.com/upload?tags=flags,TestingTeam"}};
#if !defined(DISABLE_NACL)
const FeatureEntry::Choice kNaClDebugMaskChoices[] = {
- // Secure shell can be used on ChromeOS for forwarding the TCP port opened by
- // debug stub to a remote machine. Since secure shell uses NaCl, we usually
- // want to avoid debugging that. The PNaCl translator is also a NaCl module,
- // so by default we want to avoid debugging that.
- // NOTE: As the default value must be the empty string, the mask excluding
- // the PNaCl translator and secure shell is substituted elsewhere.
- { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" },
- { IDS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask, "*://*" },
- { IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG,
- switches::kNaClDebugMask, "*://*/*debug.nmf" }
-};
+ // Secure shell can be used on ChromeOS for forwarding the TCP port opened
+ // by
+ // debug stub to a remote machine. Since secure shell uses NaCl, we usually
+ // want to avoid debugging that. The PNaCl translator is also a NaCl module,
+ // so by default we want to avoid debugging that.
+ // NOTE: As the default value must be the empty string, the mask excluding
+ // the PNaCl translator and secure shell is substituted elsewhere.
+ {IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", ""},
+ {IDS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask, "*://*"},
+ {IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG, switches::kNaClDebugMask,
+ "*://*/*debug.nmf"}};
#endif
const FeatureEntry::Choice kMarkNonSecureAsChoices[] = {
@@ -193,173 +184,149 @@ const FeatureEntry::Choice kMarkNonSecureAsChoices[] = {
security_state::switches::kMarkNonSecureAsNonSecure}};
const FeatureEntry::Choice kDataReductionProxyLoFiChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_ALWAYS_ON,
- data_reduction_proxy::switches::kDataReductionProxyLoFi,
- data_reduction_proxy::switches::kDataReductionProxyLoFiValueAlwaysOn},
- { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_CELLULAR_ONLY,
- data_reduction_proxy::switches::kDataReductionProxyLoFi,
- data_reduction_proxy::switches::
- kDataReductionProxyLoFiValueCellularOnly},
- { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_DISABLED,
- data_reduction_proxy::switches::kDataReductionProxyLoFi,
- data_reduction_proxy::switches::kDataReductionProxyLoFiValueDisabled},
- { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_SLOW_CONNECTIONS_ONLY,
- data_reduction_proxy::switches::kDataReductionProxyLoFi,
- data_reduction_proxy::switches::
- kDataReductionProxyLoFiValueSlowConnectionsOnly}
-};
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_ALWAYS_ON,
+ data_reduction_proxy::switches::kDataReductionProxyLoFi,
+ data_reduction_proxy::switches::kDataReductionProxyLoFiValueAlwaysOn},
+ {IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_CELLULAR_ONLY,
+ data_reduction_proxy::switches::kDataReductionProxyLoFi,
+ data_reduction_proxy::switches::kDataReductionProxyLoFiValueCellularOnly},
+ {IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_DISABLED,
+ data_reduction_proxy::switches::kDataReductionProxyLoFi,
+ data_reduction_proxy::switches::kDataReductionProxyLoFiValueDisabled},
+ {IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_SLOW_CONNECTIONS_ONLY,
+ data_reduction_proxy::switches::kDataReductionProxyLoFi,
+ data_reduction_proxy::switches::
+ kDataReductionProxyLoFiValueSlowConnectionsOnly}};
const FeatureEntry::Choice kShowSavedCopyChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_FLAGS_ENABLE_SHOW_SAVED_COPY_PRIMARY,
- error_page::switches::kShowSavedCopy,
- error_page::switches::kEnableShowSavedCopyPrimary },
- { IDS_FLAGS_ENABLE_SHOW_SAVED_COPY_SECONDARY,
- error_page::switches::kShowSavedCopy,
- error_page::switches::kEnableShowSavedCopySecondary },
- { IDS_FLAGS_DISABLE_SHOW_SAVED_COPY,
- error_page::switches::kShowSavedCopy,
- error_page::switches::kDisableShowSavedCopy }
-};
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_FLAGS_ENABLE_SHOW_SAVED_COPY_PRIMARY,
+ error_page::switches::kShowSavedCopy,
+ error_page::switches::kEnableShowSavedCopyPrimary},
+ {IDS_FLAGS_ENABLE_SHOW_SAVED_COPY_SECONDARY,
+ error_page::switches::kShowSavedCopy,
+ error_page::switches::kEnableShowSavedCopySecondary},
+ {IDS_FLAGS_DISABLE_SHOW_SAVED_COPY, error_page::switches::kShowSavedCopy,
+ error_page::switches::kDisableShowSavedCopy}};
const FeatureEntry::Choice kDefaultTileWidthChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_FLAGS_DEFAULT_TILE_WIDTH_SHORT,
- switches::kDefaultTileWidth, "128"},
- { IDS_FLAGS_DEFAULT_TILE_WIDTH_TALL,
- switches::kDefaultTileWidth, "256"},
- { IDS_FLAGS_DEFAULT_TILE_WIDTH_GRANDE,
- switches::kDefaultTileWidth, "512"},
- { IDS_FLAGS_DEFAULT_TILE_WIDTH_VENTI,
- switches::kDefaultTileWidth, "1024"}
-};
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_FLAGS_DEFAULT_TILE_WIDTH_SHORT, switches::kDefaultTileWidth, "128"},
+ {IDS_FLAGS_DEFAULT_TILE_WIDTH_TALL, switches::kDefaultTileWidth, "256"},
+ {IDS_FLAGS_DEFAULT_TILE_WIDTH_GRANDE, switches::kDefaultTileWidth, "512"},
+ {IDS_FLAGS_DEFAULT_TILE_WIDTH_VENTI, switches::kDefaultTileWidth, "1024"}};
const FeatureEntry::Choice kDefaultTileHeightChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_FLAGS_DEFAULT_TILE_HEIGHT_SHORT,
- switches::kDefaultTileHeight, "128"},
- { IDS_FLAGS_DEFAULT_TILE_HEIGHT_TALL,
- switches::kDefaultTileHeight, "256"},
- { IDS_FLAGS_DEFAULT_TILE_HEIGHT_GRANDE,
- switches::kDefaultTileHeight, "512"},
- { IDS_FLAGS_DEFAULT_TILE_HEIGHT_VENTI,
- switches::kDefaultTileHeight, "1024"}
-};
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_FLAGS_DEFAULT_TILE_HEIGHT_SHORT, switches::kDefaultTileHeight, "128"},
+ {IDS_FLAGS_DEFAULT_TILE_HEIGHT_TALL, switches::kDefaultTileHeight, "256"},
+ {IDS_FLAGS_DEFAULT_TILE_HEIGHT_GRANDE, switches::kDefaultTileHeight, "512"},
+ {IDS_FLAGS_DEFAULT_TILE_HEIGHT_VENTI, switches::kDefaultTileHeight,
+ "1024"}};
const FeatureEntry::Choice kSimpleCacheBackendChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
- switches::kUseSimpleCacheBackend, "off" },
- { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
- switches::kUseSimpleCacheBackend, "on"}
-};
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kUseSimpleCacheBackend,
+ "off"},
+ {IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, switches::kUseSimpleCacheBackend,
+ "on"}};
#if defined(OS_ANDROID)
const FeatureEntry::Choice kReaderModeHeuristicsChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
- { IDS_FLAGS_READER_MODE_HEURISTICS_MARKUP,
- switches::kReaderModeHeuristics,
- switches::reader_mode_heuristics::kOGArticle },
- { IDS_FLAGS_READER_MODE_HEURISTICS_ADABOOST,
- switches::kReaderModeHeuristics,
- switches::reader_mode_heuristics::kAdaBoost },
- { IDS_FLAGS_READER_MODE_HEURISTICS_ALWAYS_ON,
- switches::kReaderModeHeuristics,
- switches::reader_mode_heuristics::kAlwaysTrue },
- { IDS_FLAGS_READER_MODE_HEURISTICS_ALWAYS_OFF,
- switches::kReaderModeHeuristics,
- switches::reader_mode_heuristics::kNone },
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_FLAGS_READER_MODE_HEURISTICS_MARKUP, switches::kReaderModeHeuristics,
+ switches::reader_mode_heuristics::kOGArticle},
+ {IDS_FLAGS_READER_MODE_HEURISTICS_ADABOOST, switches::kReaderModeHeuristics,
+ switches::reader_mode_heuristics::kAdaBoost},
+ {IDS_FLAGS_READER_MODE_HEURISTICS_ALWAYS_ON,
+ switches::kReaderModeHeuristics,
+ switches::reader_mode_heuristics::kAlwaysTrue},
+ {IDS_FLAGS_READER_MODE_HEURISTICS_ALWAYS_OFF,
+ switches::kReaderModeHeuristics, switches::reader_mode_heuristics::kNone},
};
#endif
const FeatureEntry::Choice kNumRasterThreadsChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_FLAGS_NUM_RASTER_THREADS_ONE, switches::kNumRasterThreads, "1" },
- { IDS_FLAGS_NUM_RASTER_THREADS_TWO, switches::kNumRasterThreads, "2" },
- { IDS_FLAGS_NUM_RASTER_THREADS_THREE, switches::kNumRasterThreads, "3" },
- { IDS_FLAGS_NUM_RASTER_THREADS_FOUR, switches::kNumRasterThreads, "4" }
-};
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_FLAGS_NUM_RASTER_THREADS_ONE, switches::kNumRasterThreads, "1"},
+ {IDS_FLAGS_NUM_RASTER_THREADS_TWO, switches::kNumRasterThreads, "2"},
+ {IDS_FLAGS_NUM_RASTER_THREADS_THREE, switches::kNumRasterThreads, "3"},
+ {IDS_FLAGS_NUM_RASTER_THREADS_FOUR, switches::kNumRasterThreads, "4"}};
const FeatureEntry::Choice kGpuRasterizationMSAASampleCountChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT,
- "",
- "" },
- { IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_ZERO,
- switches::kGpuRasterizationMSAASampleCount, "0" },
- { IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_TWO,
- switches::kGpuRasterizationMSAASampleCount, "2" },
- { IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_FOUR,
- switches::kGpuRasterizationMSAASampleCount, "4" },
- { IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_EIGHT,
- switches::kGpuRasterizationMSAASampleCount, "8" },
- { IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_SIXTEEN,
- switches::kGpuRasterizationMSAASampleCount, "16" },
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_ZERO,
+ switches::kGpuRasterizationMSAASampleCount, "0"},
+ {IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_TWO,
+ switches::kGpuRasterizationMSAASampleCount, "2"},
+ {IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_FOUR,
+ switches::kGpuRasterizationMSAASampleCount, "4"},
+ {IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_EIGHT,
+ switches::kGpuRasterizationMSAASampleCount, "8"},
+ {IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_SIXTEEN,
+ switches::kGpuRasterizationMSAASampleCount, "16"},
};
const FeatureEntry::Choice kEnableGpuRasterizationChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
- switches::kEnableGpuRasterization, "" },
- { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
- switches::kDisableGpuRasterization, "" },
- { IDS_FLAGS_FORCE_GPU_RASTERIZATION,
- switches::kForceGpuRasterization, "" },
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, switches::kEnableGpuRasterization,
+ ""},
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kDisableGpuRasterization,
+ ""},
+ {IDS_FLAGS_FORCE_GPU_RASTERIZATION, switches::kForceGpuRasterization, ""},
};
#if defined(OS_CHROMEOS)
const FeatureEntry::Choice kMemoryPressureThresholdChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_FLAGS_CONSERVATIVE_THRESHOLDS,
- chromeos::switches::kMemoryPressureThresholds,
- chromeos::switches::kConservativeThreshold },
- { IDS_FLAGS_AGGRESSIVE_CACHE_DISCARD_THRESHOLDS,
- chromeos::switches::kMemoryPressureThresholds,
- chromeos::switches::kAggressiveCacheDiscardThreshold },
- { IDS_FLAGS_AGGRESSIVE_TAB_DISCARD_THRESHOLDS,
- chromeos::switches::kMemoryPressureThresholds,
- chromeos::switches::kAggressiveTabDiscardThreshold },
- { IDS_FLAGS_AGGRESSIVE_THRESHOLDS,
- chromeos::switches::kMemoryPressureThresholds,
- chromeos::switches::kAggressiveThreshold },
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_FLAGS_CONSERVATIVE_THRESHOLDS,
+ chromeos::switches::kMemoryPressureThresholds,
+ chromeos::switches::kConservativeThreshold},
+ {IDS_FLAGS_AGGRESSIVE_CACHE_DISCARD_THRESHOLDS,
+ chromeos::switches::kMemoryPressureThresholds,
+ chromeos::switches::kAggressiveCacheDiscardThreshold},
+ {IDS_FLAGS_AGGRESSIVE_TAB_DISCARD_THRESHOLDS,
+ chromeos::switches::kMemoryPressureThresholds,
+ chromeos::switches::kAggressiveTabDiscardThreshold},
+ {IDS_FLAGS_AGGRESSIVE_THRESHOLDS,
+ chromeos::switches::kMemoryPressureThresholds,
+ chromeos::switches::kAggressiveThreshold},
};
#endif
const FeatureEntry::Choice kExtensionContentVerificationChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_BOOTSTRAP,
- switches::kExtensionContentVerification,
- switches::kExtensionContentVerificationBootstrap },
- { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE,
- switches::kExtensionContentVerification,
- switches::kExtensionContentVerificationEnforce },
- { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT,
- switches::kExtensionContentVerification,
- switches::kExtensionContentVerificationEnforceStrict },
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_BOOTSTRAP,
+ switches::kExtensionContentVerification,
+ switches::kExtensionContentVerificationBootstrap},
+ {IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE,
+ switches::kExtensionContentVerification,
+ switches::kExtensionContentVerificationEnforce},
+ {IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT,
+ switches::kExtensionContentVerification,
+ switches::kExtensionContentVerificationEnforceStrict},
};
const FeatureEntry::Choice kFillOnAccountSelectChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
- autofill::switches::kDisableFillOnAccountSelect, "" },
- { IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_ENABLE_HIGHLIGHTING,
- autofill::switches::kEnableFillOnAccountSelect, "" },
- { IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_ENABLE_NO_HIGHLIGHTING,
- autofill::switches::kEnableFillOnAccountSelectNoHighlighting, "" },
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
+ autofill::switches::kDisableFillOnAccountSelect, ""},
+ {IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_ENABLE_HIGHLIGHTING,
+ autofill::switches::kEnableFillOnAccountSelect, ""},
+ {IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_ENABLE_NO_HIGHLIGHTING,
+ autofill::switches::kEnableFillOnAccountSelectNoHighlighting, ""},
};
#if defined(ENABLE_TOPCHROME_MD)
const FeatureEntry::Choice kTopChromeMaterialDesignChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL,
- switches::kTopChromeMD,
- switches::kTopChromeMDNonMaterial },
- { IDS_FLAGS_TOP_CHROME_MD_MATERIAL,
- switches::kTopChromeMD,
- switches::kTopChromeMDMaterial },
- { IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID,
- switches::kTopChromeMD,
- switches::kTopChromeMDMaterialHybrid },
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, switches::kTopChromeMD,
+ switches::kTopChromeMDNonMaterial},
+ {IDS_FLAGS_TOP_CHROME_MD_MATERIAL, switches::kTopChromeMD,
+ switches::kTopChromeMDMaterial},
+ {IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID, switches::kTopChromeMD,
+ switches::kTopChromeMDMaterialHybrid},
};
#endif
@@ -385,64 +352,59 @@ const FeatureEntry::Choice kAshMaterialDesignInkDropAnimationSpeed[] = {
switches::kMaterialDesignInkDropAnimationSpeedSlow}};
const FeatureEntry::Choice kDataSaverPromptChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
- chromeos::switches::kEnableDataSaverPrompt, "" },
- { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
- chromeos::switches::kDisableDataSaverPrompt, "" },
- { IDS_FLAGS_DATASAVER_PROMPT_DEMO_MODE,
- chromeos::switches::kEnableDataSaverPrompt,
- chromeos::switches::kDataSaverPromptDemoMode },
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
+ chromeos::switches::kEnableDataSaverPrompt, ""},
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
+ chromeos::switches::kDisableDataSaverPrompt, ""},
+ {IDS_FLAGS_DATASAVER_PROMPT_DEMO_MODE,
+ chromeos::switches::kEnableDataSaverPrompt,
+ chromeos::switches::kDataSaverPromptDemoMode},
};
#endif
const FeatureEntry::Choice kSupervisedUserSafeSitesChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
- switches::kSupervisedUserSafeSites,
- "enabled" },
- { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
- switches::kSupervisedUserSafeSites,
- "disabled" },
- { IDS_SUPERVISED_USER_SAFESITES_BLACKLIST_ONLY,
- switches::kSupervisedUserSafeSites,
- "blacklist-only" },
- { IDS_SUPERVISED_USER_SAFESITES_ONLINE_CHECK_ONLY,
- switches::kSupervisedUserSafeSites,
- "online-check-only" }
-};
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, switches::kSupervisedUserSafeSites,
+ "enabled"},
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kSupervisedUserSafeSites,
+ "disabled"},
+ {IDS_SUPERVISED_USER_SAFESITES_BLACKLIST_ONLY,
+ switches::kSupervisedUserSafeSites, "blacklist-only"},
+ {IDS_SUPERVISED_USER_SAFESITES_ONLINE_CHECK_ONLY,
+ switches::kSupervisedUserSafeSites, "online-check-only"}};
const FeatureEntry::Choice kV8CacheOptionsChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kV8CacheOptions, "none" },
- { IDS_FLAGS_V8_CACHE_OPTIONS_PARSE, switches::kV8CacheOptions, "parse" },
- { IDS_FLAGS_V8_CACHE_OPTIONS_CODE, switches::kV8CacheOptions, "code" },
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kV8CacheOptions, "none"},
+ {IDS_FLAGS_V8_CACHE_OPTIONS_PARSE, switches::kV8CacheOptions, "parse"},
+ {IDS_FLAGS_V8_CACHE_OPTIONS_CODE, switches::kV8CacheOptions, "code"},
};
#if defined(OS_ANDROID)
const FeatureEntry::Choice kProgressBarAnimationChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
- switches::kProgressBarAnimation, "disabled" },
- { IDS_FLAGS_PROGRESS_BAR_ANIMATION_LINEAR,
- switches::kProgressBarAnimation, "linear" },
- { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH,
- switches::kProgressBarAnimation, "smooth" },
- { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH_INDETERMINATE,
- switches::kProgressBarAnimation, "smooth-indeterminate" },
- { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START,
- switches::kProgressBarAnimation, "fast-start" },
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kProgressBarAnimation,
+ "disabled"},
+ {IDS_FLAGS_PROGRESS_BAR_ANIMATION_LINEAR, switches::kProgressBarAnimation,
+ "linear"},
+ {IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH, switches::kProgressBarAnimation,
+ "smooth"},
+ {IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH_INDETERMINATE,
+ switches::kProgressBarAnimation, "smooth-indeterminate"},
+ {IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START,
+ switches::kProgressBarAnimation, "fast-start"},
};
#endif // defined(OS_ANDROID)
#if defined(OS_CHROMEOS)
const FeatureEntry::Choice kCrosRegionsModeChoices[] = {
- { IDS_FLAGS_CROS_REGIONS_MODE_DEFAULT, "", "" },
- { IDS_FLAGS_CROS_REGIONS_MODE_OVERRIDE, chromeos::switches::kCrosRegionsMode,
- chromeos::switches::kCrosRegionsModeOverride },
- { IDS_FLAGS_CROS_REGIONS_MODE_HIDE, chromeos::switches::kCrosRegionsMode,
- chromeos::switches::kCrosRegionsModeHide },
+ {IDS_FLAGS_CROS_REGIONS_MODE_DEFAULT, "", ""},
+ {IDS_FLAGS_CROS_REGIONS_MODE_OVERRIDE, chromeos::switches::kCrosRegionsMode,
+ chromeos::switches::kCrosRegionsModeOverride},
+ {IDS_FLAGS_CROS_REGIONS_MODE_HIDE, chromeos::switches::kCrosRegionsMode,
+ chromeos::switches::kCrosRegionsModeHide},
};
#endif // defined(OS_CHROMEOS)
@@ -490,11 +452,11 @@ const FeatureEntry::Choice kNtpSwitchToExistingTabChoices[] = {
const FeatureEntry::Choice kUpdateMenuItemSummaryChoices[] = {
{IDS_FLAGS_UPDATE_MENU_ITEM_NO_SUMMARY, "", ""},
{IDS_FLAGS_UPDATE_MENU_ITEM_DEFAULT_SUMMARY,
- switches::kForceShowUpdateMenuItemSummary, ""},
+ switches::kForceShowUpdateMenuItemSummary, ""},
{IDS_FLAGS_UPDATE_MENU_ITEM_NEW_FEATURES_SUMMARY,
- switches::kForceShowUpdateMenuItemNewFeaturesSummary, ""},
+ switches::kForceShowUpdateMenuItemNewFeaturesSummary, ""},
{IDS_FLAGS_UPDATE_MENU_ITEM_CUSTOM_SUMMARY,
- switches::kForceShowUpdateMenuItemCustomSummary, "Custom summary"},
+ switches::kForceShowUpdateMenuItemCustomSummary, "Custom summary"},
};
#endif // defined(OS_ANDROID)
@@ -517,11 +479,11 @@ const FeatureEntry::Choice kHerbPrototypeChoices[] = {
#endif // defined(OS_ANDROID)
const FeatureEntry::Choice kEnableUseZoomForDSFChoices[] = {
- { IDS_FLAGS_ENABLE_USE_ZOOM_FOR_DSF_CHOICE_DEFAULT, "", ""},
- { IDS_FLAGS_ENABLE_USE_ZOOM_FOR_DSF_CHOICE_ENABLED,
- switches::kEnableUseZoomForDSF, "true" },
- { IDS_FLAGS_ENABLE_USE_ZOOM_FOR_DSF_CHOICE_DISABLED,
- switches::kEnableUseZoomForDSF, "false" },
+ {IDS_FLAGS_ENABLE_USE_ZOOM_FOR_DSF_CHOICE_DEFAULT, "", ""},
+ {IDS_FLAGS_ENABLE_USE_ZOOM_FOR_DSF_CHOICE_ENABLED,
+ switches::kEnableUseZoomForDSF, "true"},
+ {IDS_FLAGS_ENABLE_USE_ZOOM_FOR_DSF_CHOICE_DISABLED,
+ switches::kEnableUseZoomForDSF, "false"},
};
// RECORDING USER METRICS FOR FLAGS:
@@ -598,7 +560,7 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid,
SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)},
#endif
- // Native client is compiled out when DISABLE_NACL is defined.
+// Native client is compiled out when DISABLE_NACL is defined.
#if !defined(DISABLE_NACL)
{"enable-nacl", // FLAGS:RECORD_UMA
IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll,
@@ -873,9 +835,8 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS,
SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen),
},
- {
- "ash-md", IDS_FLAGS_ASH_MD, IDS_FLAGS_ASH_MD_DESCRIPTION, kOsCrOS,
- MULTI_VALUE_TYPE(kAshMaterialDesignChoices)},
+ {"ash-md", IDS_FLAGS_ASH_MD, IDS_FLAGS_ASH_MD_DESCRIPTION, kOsCrOS,
+ MULTI_VALUE_TYPE(kAshMaterialDesignChoices)},
{
"ash-stable-overview-order", IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME,
IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION, kOsCrOS,
@@ -1187,6 +1148,11 @@ const FeatureEntry kFeatureEntries[] = {
ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX,
switches::kDisableTranslateNewUX)},
#endif
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
+ {"translate-2016q2-ui", IDS_FLAGS_TRANSLATE_2016Q2_UI_NAME,
groby-ooo-7-16 2016/05/05 22:44:34 this part LG :)
+ IDS_FLAGS_TRANSLATE_2016Q2_UI_DESCRIPTION, kOsCrOS | kOsWin | kOsLinux,
+ FEATURE_VALUE_TYPE(translate::kTranslateUI2016Q2)},
+#endif
#if defined(OS_MACOSX)
{"enable-native-notifications", IDS_NOTIFICATIONS_NATIVE_FLAG,
IDS_NOTIFICATIONS_NATIVE_FLAG_DESCRIPTION, kOsMac,
@@ -1515,8 +1481,7 @@ const FeatureEntry kFeatureEntries[] = {
SINGLE_VALUE_TYPE(switches::kEnableWebRtcDtls12)},
#endif
#if defined(ENABLE_WEBRTC)
- {"enable-webrtc-ecdsa",
- IDS_FLAGS_WEBRTC_ECDSA_NAME,
+ {"enable-webrtc-ecdsa", IDS_FLAGS_WEBRTC_ECDSA_NAME,
IDS_FLAGS_WEBRTC_ECDSA_DESCRIPTION, kOsAll,
FEATURE_VALUE_TYPE(features::kWebRtcEcdsaDefault)},
#endif
@@ -1818,20 +1783,17 @@ const FeatureEntry kFeatureEntries[] = {
SINGLE_VALUE_TYPE(switches::kEnableFullscreenTabDetaching)},
#endif
#if defined(OS_ANDROID)
- {"media-style-notification",
- IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_NAME,
+ {"media-style-notification", IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_NAME,
IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_DESCRIPTION, kOsAndroid,
FEATURE_VALUE_TYPE(chrome::android::kMediaStyleNotification)},
- {"important-sites-in-cbd",
- IDS_FLAGS_IMPORTANT_SITES_IN_CBD_NAME,
+ {"important-sites-in-cbd", IDS_FLAGS_IMPORTANT_SITES_IN_CBD_NAME,
IDS_FLAGS_IMPORTANT_SITES_IN_CBD_DESCRIPTION, kOsAndroid,
FEATURE_VALUE_TYPE(chrome::android::kImportantSitesInCBD)},
#endif
{"enable-pointer-events", // FLAGS:RECORD_UMA
- IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_NAME,
- IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_DESCRIPTION,
- kOsAll,
- FEATURE_VALUE_TYPE(features::kPointerEvents)},
+ IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_NAME,
+ IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_DESCRIPTION, kOsAll,
+ FEATURE_VALUE_TYPE(features::kPointerEvents)},
// NOTE: Adding new command-line switches requires adding corresponding
// entries to enum "LoginCustomFlags" in histograms.xml. See note in
// histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
@@ -1890,8 +1852,7 @@ bool SkipConditionalFeatureEntry(const FeatureEntry& entry) {
}
// enable-tab-switcher-in-document-mode is only available for Chromium
// builds and the Canary channel.
- if (!strcmp("enable-tab-switcher-in-document-mode",
- entry.internal_name) &&
+ if (!strcmp("enable-tab-switcher-in-document-mode", entry.internal_name) &&
channel != version_info::Channel::CANARY &&
channel != version_info::Channel::UNKNOWN) {
return true;
« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698