diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 20:05:57 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 20:05:57 +0000 |
| commit | 6a0ee4ec5905be6182b20218da1c276fc7e457fd (patch) | |
| tree | 5ade1bf32e5f2d6c27026bdbbb03a50d1eefd5d6 /chrome/plugin | |
| parent | a0ae20be77b89edf8ecf221ef3decc37b870014b (diff) | |
| download | chromium_src-6a0ee4ec5905be6182b20218da1c276fc7e457fd.zip chromium_src-6a0ee4ec5905be6182b20218da1c276fc7e457fd.tar.gz chromium_src-6a0ee4ec5905be6182b20218da1c276fc7e457fd.tar.bz2 | |
Linux: Initial scaffolding for default plugin.
Basically the linux version of http://codereview.chromium.org/2075006
BUG=10952
TEST=Go to http://www.adobe.com/shockwave/welcome/. The task manager should show that the default plugin is running, and the "Missing Plug-in" text should look slightly different than it did before. Also, the plugin area is now grey instead of transparent. (this test depends on a small webkit shown below)
Requires commenting out
if (objectContentType(url, mimeType) != ObjectContentNetscapePlugin)
return 0;
in WebKit/WebKit/chromium/src/FrameLoaderClientImpl.cpp's createPlugin() as well, else the default plugin won't load.
Review URL: http://codereview.chromium.org/2079016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/plugin_thread.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc index 0920c7c..e4fd235 100644 --- a/chrome/plugin/plugin_thread.cc +++ b/chrome/plugin/plugin_thread.cc @@ -207,12 +207,7 @@ bool GetPluginFinderURL(std::string* plugin_finder_url) { } bool IsDefaultPluginEnabled() { -#if defined(OS_WIN) || defined(OS_MACOSX) return true; -#elif defined(OS_LINUX) - // http://code.google.com/p/chromium/issues/detail?id=10952 - return false; -#endif } // Dispatch the resolve proxy resquest to the right code, depending on which |