From de49ea10c04eb354ab0187b8f98898c272660037 Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Wed, 19 May 2010 21:55:10 +0000 Subject: Revert 47726 (turned nacl_ui_tests red) - Mac: First steps for default plugin BUG=17392 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. (this test depends on a small webkit patch) 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/2075006 TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/2132018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47730 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/plugin/plugin_thread.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'chrome/plugin/plugin_thread.cc') diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc index 0920c7c..e74e95e 100644 --- a/chrome/plugin/plugin_thread.cc +++ b/chrome/plugin/plugin_thread.cc @@ -207,11 +207,14 @@ bool GetPluginFinderURL(std::string* plugin_finder_url) { } bool IsDefaultPluginEnabled() { -#if defined(OS_WIN) || defined(OS_MACOSX) +#if defined(OS_WIN) return true; #elif defined(OS_LINUX) // http://code.google.com/p/chromium/issues/detail?id=10952 return false; +#elif defined(OS_MACOSX) + // http://code.google.com/p/chromium/issues/detail?id=17392 + return false; #endif } -- cgit v1.1