| Index: chrome/renderer/chrome_content_renderer_client.cc
|
| diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
|
| index aee9188415804e367ab24d1685f6065e44fd0689..138d8ce1b2406378fb35869c3efa6c8b07cb1dd5 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.cc
|
| +++ b/chrome/renderer/chrome_content_renderer_client.cc
|
| @@ -411,15 +411,12 @@ std::string ChromeContentRendererClient::GetDefaultEncoding() {
|
| return l10n_util::GetStringUTF8(IDS_DEFAULT_ENCODING);
|
| }
|
|
|
| -const Extension* ChromeContentRendererClient::GetExtension(
|
| +const Extension* ChromeContentRendererClient::GetExtensionByOrigin(
|
| const WebSecurityOrigin& origin) const {
|
| if (!EqualsASCII(origin.protocol(), extensions::kExtensionScheme))
|
| return NULL;
|
|
|
| const std::string extension_id = origin.host().utf8().data();
|
| - if (!extension_dispatcher_->IsExtensionActive(extension_id))
|
| - return NULL;
|
| -
|
| return extension_dispatcher_->extensions()->GetByID(extension_id);
|
| }
|
|
|
| @@ -435,7 +432,7 @@ bool ChromeContentRendererClient::OverrideCreatePlugin(
|
| return false;
|
| WebDocument document = frame->document();
|
| const Extension* extension =
|
| - GetExtension(document.securityOrigin());
|
| + GetExtensionByOrigin(document.securityOrigin());
|
| if (extension) {
|
| const extensions::APIPermission::ID perms[] = {
|
| extensions::APIPermission::kWebView,
|
|
|