diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 23:53:17 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 23:53:17 +0000 |
| commit | 8dc30c4e4abf9b46668508d7997c11ab13f5e1ce (patch) | |
| tree | f62e40f9dd91ea3c63e48f88f1a3db75ccb1071e /chrome/common/default_plugin.cc | |
| parent | deea482147bc8ef0ba15eef386dba1af394f4bae (diff) | |
| download | chromium_src-8dc30c4e4abf9b46668508d7997c11ab13f5e1ce.zip chromium_src-8dc30c4e4abf9b46668508d7997c11ab13f5e1ce.tar.gz chromium_src-8dc30c4e4abf9b46668508d7997c11ab13f5e1ce.tar.bz2 | |
Modify code in chrome to call wrapper functions on PluginService
rather than calling into webkit::npapi::PluginList directly.
This change is necessary to ensure we only have one list when we switch
content to the component build.
R=jam@chromium.org
TBR=cpu@chromium.org
BUG=
TEST=
Review URL: http://codereview.chromium.org/8440058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108744 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/default_plugin.cc')
| -rw-r--r-- | chrome/common/default_plugin.cc | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/chrome/common/default_plugin.cc b/chrome/common/default_plugin.cc deleted file mode 100644 index b9b8fab..0000000 --- a/chrome/common/default_plugin.cc +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) 2011 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. - -#include "base/utf_string_conversions.h" -#include "chrome/common/default_plugin.h" -#include "chrome/default_plugin/plugin_main.h" -#include "webkit/plugins/npapi/plugin_list.h" - -namespace chrome { - -void RegisterInternalDefaultPlugin() { -#if defined(OS_WIN) && !defined(USE_AURA) - // TODO(bauerb): On Windows the default plug-in can download and install - // missing plug-ins, which we don't support in the browser yet, so keep - // using the default plug-in on Windows until we do. - // Aura isn't going to support NPAPI plugins. - const webkit::npapi::PluginEntryPoints entry_points = { -#if !defined(OS_POSIX) || defined(OS_MACOSX) - default_plugin::NP_GetEntryPoints, -#endif - default_plugin::NP_Initialize, - default_plugin::NP_Shutdown - }; - - webkit::WebPluginInfo info; - info.path = FilePath(webkit::npapi::kDefaultPluginLibraryName); - info.name = ASCIIToUTF16("Default Plug-in"); - info.version = ASCIIToUTF16("1"); - info.desc = ASCIIToUTF16("Provides functionality for installing third-party " - "plug-ins"); - - webkit::WebPluginMimeType mimeType; - mimeType.mime_type = "*"; - info.mime_types.push_back(mimeType); - - webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin( - info, - entry_points, - false); -#endif -} - -} // namespace chrome |