diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-14 18:54:39 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-14 18:54:39 +0000 |
commit | 47a87ca4a7dc35ec539db4c2331ab316c1ad325d (patch) | |
tree | 90a7b98335b67cecc48ed64841cc38e586f051a3 /chrome/browser/plugin_updater.h | |
parent | c1aaf6b0b1427f6b2cf20d73604735d92a89c6ee (diff) | |
download | chromium_src-47a87ca4a7dc35ec539db4c2331ab316c1ad325d.zip chromium_src-47a87ca4a7dc35ec539db4c2331ab316c1ad325d.tar.gz chromium_src-47a87ca4a7dc35ec539db4c2331ab316c1ad325d.tar.bz2 |
Make sure that if Reader is installed after Chrome and the internal PDF reader is enabled, that Reader is disabled.
Make PluginList not forget that a hardcoded group is disabled by the user after it loads the plugins. Also ensure a lock is grabbed before calling AddToPluginGroups, since it uses groups_to_disable_.
BUG=72617
Review URL: http://codereview.chromium.org/6507001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_updater.h')
-rw-r--r-- | chrome/browser/plugin_updater.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/plugin_updater.h b/chrome/browser/plugin_updater.h index 2c4fed7..b30418e 100644 --- a/chrome/browser/plugin_updater.h +++ b/chrome/browser/plugin_updater.h @@ -82,10 +82,6 @@ class PluginUpdater : public NotificationObserver { // Needed to allow singleton instantiation using private constructor. friend struct DefaultSingletonTraits<PluginUpdater>; - // 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. - bool enable_internal_pdf_; - bool notify_pending_; DISALLOW_COPY_AND_ASSIGN(PluginUpdater); |