summaryrefslogtreecommitdiffstats
path: root/chrome/browser/plugins/plugin_prefs.h
diff options
context:
space:
mode:
authorraymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-26 20:51:20 +0000
committerraymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-26 20:51:20 +0000
commit9171897a14982462f011eb401727b759f65eaa70 (patch)
treeff39a875534c24a50b691dad0abb07c59157c5f0 /chrome/browser/plugins/plugin_prefs.h
parentb8b7debd205af85a1214e5cb907bea7549bdbc42 (diff)
downloadchromium_src-9171897a14982462f011eb401727b759f65eaa70.zip
chromium_src-9171897a14982462f011eb401727b759f65eaa70.tar.gz
chromium_src-9171897a14982462f011eb401727b759f65eaa70.tar.bz2
Revert 184265
Revert this temporary change now that we have verified it has no impact on memory consumption. > Revert 180288 > > This is to test the hypothesis that this change is responsible for a memory increase in the plugin process. It is a temporary change and should be reverted within the coming days. > > BUG=176330 > > > Fix enable state of Pepper Flash. > > > > Component-updated and bundled Pepper Flash share the same enable state. When > > reading from the Preferences file, the previous code ignored the enable state > > if it was associated with the component-updated path. That was wrong because if > > the component-updated Flash was newer, the enable state would be recorded with > > that path. The outcome was that everytime users restarted the browser, Pepper > > Flash was enabled, even if they disabled it before. > > > > TBR=bauerb@chromium.org > > BUG=150596 > > TEST=None > > > > Review URL: https://codereview.chromium.org/12079044 > > TBR=yzshen@chromium.org > > Review URL: https://chromiumcodereview.appspot.com/12316081 TBR=yzshen Review URL: https://codereview.chromium.org/12314110 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugins/plugin_prefs.h')
-rw-r--r--chrome/browser/plugins/plugin_prefs.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/browser/plugins/plugin_prefs.h b/chrome/browser/plugins/plugin_prefs.h
index 4b2e18b..4aca8f7 100644
--- a/chrome/browser/plugins/plugin_prefs.h
+++ b/chrome/browser/plugins/plugin_prefs.h
@@ -99,9 +99,6 @@ class PluginPrefs : public RefcountedProfileKeyedService {
// |*enabled| won't be touched.
bool Get(const base::FilePath& plugin, bool* enabled) const;
void Set(const base::FilePath& plugin, bool enabled);
- // It is similar to Set(), except that it does nothing if |plugin| needs to
- // be converted to a different key.
- void SetIgnorePseudoKey(const base::FilePath& plugin, bool enabled);
private:
base::FilePath ConvertMapKey(const base::FilePath& plugin) const;