Chromium Code Reviews| Index: content/browser/plugin_service.cc |
| =================================================================== |
| --- content/browser/plugin_service.cc (revision 96803) |
| +++ content/browser/plugin_service.cc (working copy) |
| @@ -25,6 +25,7 @@ |
| #include "content/common/notification_service.h" |
| #include "content/common/pepper_plugin_registry.h" |
| #include "content/common/plugin_messages.h" |
| +#include "content/common/url_constants.h" |
| #include "content/common/view_messages.h" |
| #include "webkit/plugins/npapi/plugin_constants_win.h" |
| #include "webkit/plugins/npapi/plugin_list.h" |
| @@ -360,7 +361,8 @@ |
| for (size_t i = 0; i < overridden_plugins_.size(); ++i) { |
| if (overridden_plugins_[i].render_process_id == render_process_id && |
| overridden_plugins_[i].render_view_id == render_view_id && |
| - overridden_plugins_[i].url == url) { |
| + (overridden_plugins_[i].url == url || |
| + url.SchemeIs(chrome::kChromeUIScheme))) { |
|
jam
2011/08/15 22:03:04
I believe you're doing this because the url for th
Lei Zhang
2011/08/16 00:16:41
Done
|
| if (actual_mime_type) |
| *actual_mime_type = mime_type; |
| *info = overridden_plugins_[i].plugin; |
| @@ -487,10 +489,10 @@ |
| const FilePath& plugin_path) { |
| PepperPluginInfo* info = NULL; |
| for (size_t i = 0; i < ppapi_plugins_.size(); i++) { |
| - if (ppapi_plugins_[i].path == plugin_path) { |
| - info = &ppapi_plugins_[i]; |
| - break; |
| - } |
| + if (ppapi_plugins_[i].path == plugin_path) { |
| + info = &ppapi_plugins_[i]; |
| + break; |
| + } |
| } |
| return info; |
| } |