diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 21:21:57 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 21:21:57 +0000 |
| commit | 623d3ae5302a62c73cf6ad18245c76b481e5d4b0 (patch) | |
| tree | 268a309256a6bec5f5539bdd594710ad756cefda /chrome/plugin | |
| parent | 5e1bf5d1b59769cb09b36815c184a1bc5802bb36 (diff) | |
| download | chromium_src-623d3ae5302a62c73cf6ad18245c76b481e5d4b0.zip chromium_src-623d3ae5302a62c73cf6ad18245c76b481e5d4b0.tar.gz chromium_src-623d3ae5302a62c73cf6ad18245c76b481e5d4b0.tar.bz2 | |
Revert 48315 - 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 Plugin" 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
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/2291004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/plugin_thread.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc index e4fd235..0920c7c 100644 --- a/chrome/plugin/plugin_thread.cc +++ b/chrome/plugin/plugin_thread.cc @@ -207,7 +207,12 @@ 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 |