summaryrefslogtreecommitdiffstats
path: root/chrome/plugin
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-20 21:38:29 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-20 21:38:29 +0000
commit76c3b3196acf73961327fcabe139ab608f96dc37 (patch)
treeabdbd988b89c30cee3abb36fbe9c8eda0ed777ba /chrome/plugin
parenteea56c6215e2211fa72f5f017c7c21d2b0faf139 (diff)
downloadchromium_src-76c3b3196acf73961327fcabe139ab608f96dc37.zip
chromium_src-76c3b3196acf73961327fcabe139ab608f96dc37.tar.gz
chromium_src-76c3b3196acf73961327fcabe139ab608f96dc37.tar.bz2
Reland 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 Plug-in" 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. <style type="text/css"> #glass { position: absolute; width: 128px; height: 128px; border: 1px solid rgba(0, 0, 0, 0.8); -webkit-border-radius: 64px; -webkit-transition-property: background-color, -webkit-box-shadow; -webkit-transition-duration: 0.25s, 0.25s; background-image: -webkit-gradient(radial, 50% 8%, 0, 50% -40%, 192, from(rgba(255, 255, 255, 0.4)), color-stop(50%, rgba(255, 255, 255, 0.07)), color-stop(51%, rgba(255, 255, 255, 0)), color-stop(52%, rgba(0, 0, 0, 0.2)), color-stop(70%, rgba(0, 0, 0, 0.1)), color-stop(99%, rgba(0, 0, 0, 0)), to(rgba(255, 255, 255, 0))); background-color: #335; -webkit-box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.5); color: white; font-family: Helvetica, Arial, sans-serif; font-size: 30px; font-weight: bold; line-height: 128px; text-align: center; text-shadow: 0px -1px 2px rgba(0, 0, 0, 0.5); } #glass:hover { background-color: #448; -webkit-box-shadow: 0px 0px 50px rgba(0, 0, 255, 0.5); } </style> <div id="glass">zomfg</div> Review URL: http://codereview.chromium.org/2075006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
-rw-r--r--chrome/plugin/plugin_thread.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc
index e74e95e..0920c7c 100644
--- a/chrome/plugin/plugin_thread.cc
+++ b/chrome/plugin/plugin_thread.cc
@@ -207,14 +207,11 @@ bool GetPluginFinderURL(std::string* plugin_finder_url) {
}
bool IsDefaultPluginEnabled() {
-#if defined(OS_WIN)
+#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;
-#elif defined(OS_MACOSX)
- // http://code.google.com/p/chromium/issues/detail?id=17392
- return false;
#endif
}