diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-14 02:23:11 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-14 02:23:11 +0000 |
| commit | c6f3deaa386fc63b64932cd296311f74a3c299db (patch) | |
| tree | 15dd4243cf6a6953b1f7572dd7886f383577a607 /content/public | |
| parent | 552c0a8a5e77a8f84a54f20b10d4d0c6c5155a6c (diff) | |
| download | chromium_src-c6f3deaa386fc63b64932cd296311f74a3c299db.zip chromium_src-c6f3deaa386fc63b64932cd296311f74a3c299db.tar.gz chromium_src-c6f3deaa386fc63b64932cd296311f74a3c299db.tar.bz2 | |
Keep "internal" and "extra" plugins in the same list.
This allows us to decide for every bundled plug-in whether it should override others.
BUG=110152
TEST=Flapper is loaded after NPAPI Flash.
Review URL: http://codereview.chromium.org/9204005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117763 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public')
| -rw-r--r-- | content/public/browser/plugin_service.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/content/public/browser/plugin_service.h b/content/public/browser/plugin_service.h index ee01e06..9a7985a 100644 --- a/content/public/browser/plugin_service.h +++ b/content/public/browser/plugin_service.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -123,9 +123,11 @@ class PluginService { // PluginList for further documentation of these functions. virtual void RefreshPlugins() = 0; virtual void AddExtraPluginPath(const FilePath& path) = 0; + virtual void AddExtraPluginDir(const FilePath& path) = 0; virtual void RemoveExtraPluginPath(const FilePath& path) = 0; virtual void UnregisterInternalPlugin(const FilePath& path) = 0; - virtual void RegisterInternalPlugin(const webkit::WebPluginInfo& info) = 0; + virtual void RegisterInternalPlugin(const webkit::WebPluginInfo& info, + bool add_at_beginning) = 0; virtual string16 GetPluginGroupName(const std::string& plugin_name) = 0; // TODO(dpranke): This should be private. |