summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-27 21:12:36 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-27 21:12:36 +0000
commitd5a4d51baac3e804ba00b72eb42b9c19dbc59ade (patch)
tree3b620e606968cedfaa4c632e61e1a7a104e0dcb6
parent6d3027c1059bb5e904d62bb22e7a31f65c6431be (diff)
downloadchromium_src-d5a4d51baac3e804ba00b72eb42b9c19dbc59ade.zip
chromium_src-d5a4d51baac3e804ba00b72eb42b9c19dbc59ade.tar.gz
chromium_src-d5a4d51baac3e804ba00b72eb42b9c19dbc59ade.tar.bz2
Disable pdf on 517
Review URL: http://codereview.chromium.org/3429030 git-svn-id: svn://svn.chromium.org/chrome/branches/517/src@60708 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/plugin_updater.cc2
-rw-r--r--chrome/common/pref_names.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/plugin_updater.cc b/chrome/browser/plugin_updater.cc
index ab303ba..1f06208 100644
--- a/chrome/browser/plugin_updater.cc
+++ b/chrome/browser/plugin_updater.cc
@@ -93,7 +93,7 @@ void EnablePluginFile(bool enable, const FilePath::StringType& path) {
// Note: if you change this to false from true, you must update
// kPluginsEnabledInternalPDF to be a new name (i.e. add 2, 3, 4...) at end.
-static bool enable_internal_pdf_ = true;
+static bool enable_internal_pdf_ = false;
void DisablePluginGroupsFromPrefs(Profile* profile) {
bool update_internal_dir = false;
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index a5f0153..fe59528 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -435,7 +435,7 @@ const char kPluginsPluginsBlacklist[] = "plugins.plugins_blacklist";
// When first shipped, the pdf plugin will be disabled by default. When we
// enable it by default, we'll want to do so only once.
-const char kPluginsEnabledInternalPDF[] = "plugins.enabled_internal_pdf";
+const char kPluginsEnabledInternalPDF[] = "plugins.enabled_internal_pdf2";
// Boolean that indicates whether we should check if we are the default browser
// on start-up.