| Index: extensions/browser/api/declarative/declarative_api.cc
|
| diff --git a/extensions/browser/api/declarative/declarative_api.cc b/extensions/browser/api/declarative/declarative_api.cc
|
| index b786fcb0c0733177b3131a6366bdea8d739f26ac..381c736297d62b2c2d2dbc8c715fe23a49c98d48 100644
|
| --- a/extensions/browser/api/declarative/declarative_api.cc
|
| +++ b/extensions/browser/api/declarative/declarative_api.cc
|
| @@ -34,6 +34,7 @@ namespace extensions {
|
| namespace {
|
|
|
| const char kWebRequest[] = "declarativeWebRequest.";
|
| +const char kDeclarativeContent[] = "declarativeContent.";
|
| const char kWebViewExpectedError[] = "Webview event with Webview ID expected.";
|
|
|
| bool IsWebViewEvent(const std::string& event_name) {
|
| @@ -48,8 +49,13 @@ bool IsWebViewEvent(const std::string& event_name) {
|
| std::string GetWebRequestEventName(const std::string& event_name) {
|
| std::string web_request_event_name(event_name);
|
| if (IsWebViewEvent(web_request_event_name)) {
|
| - web_request_event_name.replace(
|
| - 0, strlen(webview::kWebViewEventPrefix), kWebRequest);
|
| + if (web_request_event_name.find(kDeclarativeContent) == std::string::npos) {
|
| + web_request_event_name.replace(
|
| + 0, strlen(webview::kWebViewEventPrefix), kWebRequest);
|
| + } else {
|
| + web_request_event_name.replace(
|
| + 0, strlen(webview::kWebViewEventPrefix), "");
|
| + }
|
| }
|
| return web_request_event_name;
|
| }
|
|
|