summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoramanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-19 18:43:11 +0000
committeramanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-19 18:43:11 +0000
commit9a5bf36ab389af98120f9922bd191509321366da (patch)
treeb9284d209903c4c46cb21762185b4f9fadc9c34a
parentd53a76b8bc94f47de9e22d345d849d6c5e5117ea (diff)
downloadchromium_src-9a5bf36ab389af98120f9922bd191509321366da.zip
chromium_src-9a5bf36ab389af98120f9922bd191509321366da.tar.gz
chromium_src-9a5bf36ab389af98120f9922bd191509321366da.tar.bz2
Enable the Google Talk Video plugin, which seems pretty well behaved.
Review URL: http://codereview.chromium.org/173064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23720 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/glue/plugins/plugin_list_mac.mm7
1 files changed, 4 insertions, 3 deletions
diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm
index c3d216f..f270643 100644
--- a/webkit/glue/plugins/plugin_list_mac.mm
+++ b/webkit/glue/plugins/plugin_list_mac.mm
@@ -80,9 +80,10 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
// Anything using QuickDraw-based drawing, for example, would crash
// immediately.
std::string plugin_name = WideToUTF8(info.name);
- if (!(plugin_name == "WebKit Test PlugIn" || // Test plugin.
- plugin_name == "Shockwave Flash" || // CG drawing + Carbon events.
- plugin_name == "Picasa")) { // No drawing or event handling.
+ if (!(plugin_name == "WebKit Test PlugIn" ||
+ plugin_name == "Shockwave Flash" ||
+ plugin_name == "Picasa" ||
+ plugin_name == "Google Talk Browser Plugin")) {
return false;
}