diff options
| author | sehr@chromium.org <sehr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-29 10:02:55 +0000 |
|---|---|---|
| committer | sehr@chromium.org <sehr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-29 10:02:55 +0000 |
| commit | 7de24f50bd636d3caa454bb5eca3dbdeb0a41a57 (patch) | |
| tree | 41fabd3e2ddc6a238bd6d30c438bb6755875deb9 | |
| parent | ffb8706267743f92faa5314e1e61c7c76c65e0dd (diff) | |
| download | chromium_src-7de24f50bd636d3caa454bb5eca3dbdeb0a41a57.zip chromium_src-7de24f50bd636d3caa454bb5eca3dbdeb0a41a57.tar.gz chromium_src-7de24f50bd636d3caa454bb5eca3dbdeb0a41a57.tar.bz2 | |
Add --disable-pnacl to about://flags
Disabling pnacl was removed from about://flags because the previous implementation produced empty command line flags.
https://chromiumcodereview.appspot.com/23464011/
Add the ability to set it, without producing empty flags.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/23727002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220255 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/ios/grit_whitelist.txt | 4 | ||||
| -rw-r--r-- | chrome/app/generated_resources.grd | 8 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 7 |
3 files changed, 13 insertions, 6 deletions
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt index ed15d46..2abb5b3 100644 --- a/build/ios/grit_whitelist.txt +++ b/build/ios/grit_whitelist.txt @@ -484,6 +484,8 @@ IDS_FLAGS_DISABLE_NATIVE_AUTOFILL_UI_DESCRIPTION IDS_FLAGS_DISABLE_NATIVE_AUTOFILL_UI_NAME IDS_FLAGS_DISABLE_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION IDS_FLAGS_DISABLE_OVERSCROLL_HISTORY_NAVIGATION_NAME +IDS_FLAGS_DISABLE_PNACL_DESCRIPTION +IDS_FLAGS_DISABLE_PNACL_NAME IDS_FLAGS_DISABLE_RESTORE_SESSION_STATE_DESCRIPTION IDS_FLAGS_DISABLE_RESTORE_SESSION_STATE_NAME IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION @@ -670,8 +672,6 @@ IDS_FLAGS_PERFORMANCE_MONITOR_GATHERING_DESCRIPTION IDS_FLAGS_PERFORMANCE_MONITOR_GATHERING_NAME IDS_FLAGS_PER_TILE_PAINTING_DESCRIPTION IDS_FLAGS_PER_TILE_PAINTING_NAME -IDS_FLAGS_PNACL_DESCRIPTION -IDS_FLAGS_PNACL_NAME IDS_FLAGS_PRESENT_WITH_GDI_ALL_SHOW IDS_FLAGS_PRESENT_WITH_GDI_DESCRIPTION IDS_FLAGS_PRESENT_WITH_GDI_FIRST_SHOW diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index edd9dbc..8c5c691 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -5380,11 +5380,11 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS"> Debug everything except secure shell </message> - <message name="IDS_FLAGS_PNACL_NAME" desc="Name of the 'Portable Native Client' lab."> - Portable Native Client. + <message name="IDS_FLAGS_DISABLE_PNACL_NAME" desc="Name of the 'Disable Portable Native Client' lab."> + Disable Portable Native Client. </message> - <message name="IDS_FLAGS_PNACL_DESCRIPTION" desc="Description of the 'Portable Native Client' lab."> - Enable support for Portable Native Client. + <message name="IDS_FLAGS_DISABLE_PNACL_DESCRIPTION" desc="Description of the 'Disable Portable Native Client' lab."> + Disable support for Portable Native Client (PNaCl). </message> <message name="IDS_FLAGS_SAVE_PAGE_AS_MHTML_NAME" desc="Name of the 'Save Page as MHTML' lab."> Save Page as MHTML diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 4162632..8b9a606 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -515,6 +515,13 @@ const Experiment kExperiments[] = { SINGLE_VALUE_TYPE(switches::kEnableNaClDebug) }, { + "disable-pnacl", // FLAGS:RECORD_UMA + IDS_FLAGS_DISABLE_PNACL_NAME, + IDS_FLAGS_DISABLE_PNACL_DESCRIPTION, + kOsDesktop, + SINGLE_VALUE_TYPE(switches::kDisablePnacl) + }, + { "nacl-debug-mask", // FLAGS:RECORD_UMA IDS_FLAGS_NACL_DEBUG_MASK_NAME, IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, |