summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorcira@chromium.org <cira@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-10 21:33:41 +0000
committercira@chromium.org <cira@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-10 21:33:41 +0000
commit7a0c1432abc0d6bba4df569218ecf11dced9131b (patch)
treecd8fa3ead3a3e07be70e2a836627663dd8e9e8cd /chrome/common
parent792011b6f236bc691d76006573201b424d8920ec (diff)
downloadchromium_src-7a0c1432abc0d6bba4df569218ecf11dced9131b.zip
chromium_src-7a0c1432abc0d6bba4df569218ecf11dced9131b.tar.gz
chromium_src-7a0c1432abc0d6bba4df569218ecf11dced9131b.tar.bz2
Enabling JavaScript i18n API by default.
Use --disable-javascript-i18n-api to disable it. BUG=28604 Review URL: http://codereview.chromium.org/6656028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77701 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/chrome_switches.cc10
-rw-r--r--chrome/common/chrome_switches.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 50cd21d..6effd95 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -277,11 +277,14 @@ const char kDisableIPv6[] = "disable-ipv6";
// Disable speculative TCP/IP preconnection.
const char kDisablePreconnect[] = "disable-preconnect";
+// Prevent Java from running.
+const char kDisableJava[] = "disable-java";
+
// Don't execute JavaScript (browser JS like the new tab page still runs).
const char kDisableJavaScript[] = "disable-javascript";
-// Prevent Java from running.
-const char kDisableJava[] = "disable-java";
+// Disable JavaScript I18N API.
+const char kDisableJavaScriptI18NAPI[] = "disable-javascript-i18n-api";
// Disable LocalStorage.
const char kDisableLocalStorage[] = "disable-local-storage";
@@ -503,9 +506,6 @@ const char kEnableInBrowserThumbnailing[] = "enable-in-browser-thumbnailing";
// This flag overrides "disable-ipv6" which appears elswhere in this file.
const char kEnableIPv6[] = "enable-ipv6";
-// Enable experimental JavaScript I18N API.
-const char kEnableJavaScriptI18NAPI[] = "enable-javascript-i18n-api";
-
// Allows reporting memory info (JS heap size) to page.
const char kEnableMemoryInfo[] = "enable-memory-info";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 5b3c0cf..43975fe 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -89,8 +89,9 @@ extern const char kDisableInteractiveFormValidation[];
extern const char kDisableInternalFlash[];
extern const char kDisableIndexedDatabase[];
extern const char kDisableIPv6[];
-extern const char kDisableJavaScript[];
extern const char kDisableJava[];
+extern const char kDisableJavaScript[];
+extern const char kDisableJavaScriptI18NAPI[];
extern const char kDisableLocalStorage[];
extern const char kDisableNewTabFirstRun[];
extern const char kDisablePreconnect[];
@@ -149,7 +150,6 @@ extern const char kEnableFullScreen[];
extern const char kEnableHistoryQuickProvider[];
extern const char kEnableInBrowserThumbnailing[];
extern const char kEnableIPv6[];
-extern const char kEnableJavaScriptI18NAPI[];
extern const char kEnableMemoryInfo[];
extern const char kEnableNaCl[];
extern const char kEnableNaClDebug[];