| Index: webkit/glue/plugins/plugin_list_mac.mm
|
| ===================================================================
|
| --- webkit/glue/plugins/plugin_list_mac.mm (revision 25731)
|
| +++ webkit/glue/plugins/plugin_list_mac.mm (working copy)
|
| @@ -79,11 +79,13 @@
|
| // For now, only load plugins that we know are working reasonably well.
|
| // Anything using QuickDraw-based drawing, for example, would crash
|
| // immediately.
|
| +
|
| std::string plugin_name = WideToUTF8(info.name);
|
| if (!(plugin_name == "WebKit Test PlugIn" ||
|
| plugin_name == "Shockwave Flash" ||
|
| plugin_name == "Picasa" ||
|
| - plugin_name == "Google Talk Browser Plugin")) {
|
| + plugin_name == "Google Talk Browser Plugin" ||
|
| + plugin_name == "Google Talk NPAPI Plugin")) {
|
| return false;
|
| }
|
|
|
|
|