summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/web_request
diff options
context:
space:
mode:
authorlazyboy@chromium.org <lazyboy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-25 17:39:11 +0000
committerlazyboy@chromium.org <lazyboy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-25 17:39:11 +0000
commit1a895fbc4c5a8b5b763593092d93a2bfed4b7417 (patch)
tree60b0bce887796cf9d8bad1c6cef3031636055211 /chrome/browser/extensions/api/web_request
parent38b07d57b9069e3fd44b15bb5883432202ddf78a (diff)
downloadchromium_src-1a895fbc4c5a8b5b763593092d93a2bfed4b7417.zip
chromium_src-1a895fbc4c5a8b5b763593092d93a2bfed4b7417.tar.gz
chromium_src-1a895fbc4c5a8b5b763593092d93a2bfed4b7417.tar.bz2
Rename webview API related files to web_view_internal.
webview.json -> web_view_internal.json NOTRY=True BUG=388380 Test=Internal cleanup, no visible change. Review URL: https://codereview.chromium.org/347143004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/web_request')
-rw-r--r--chrome/browser/extensions/api/web_request/web_request_api.cc19
1 files changed, 12 insertions, 7 deletions
diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc
index 5560282..4a192bb 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api.cc
@@ -92,8 +92,7 @@ namespace activitylog = activity_log_web_request_constants;
namespace {
-const char kWebRequest[] = "webRequest";
-const char kWebView[] = "webview";
+const char kWebRequestEventPrefix[] = "webRequest.";
// List of all the webRequest events.
const char* const kWebRequestEvents[] = {
@@ -140,8 +139,11 @@ const char* GetRequestStageAsString(
bool IsWebRequestEvent(const std::string& event_name) {
std::string web_request_event_name(event_name);
- if (web_request_event_name.find(kWebView) != std::string::npos)
- web_request_event_name.replace(0, sizeof(kWebView) - 1, kWebRequest);
+ if (StartsWithASCII(
+ web_request_event_name, webview::kWebViewEventPrefix, true)) {
+ web_request_event_name.replace(
+ 0, strlen(webview::kWebViewEventPrefix), kWebRequestEventPrefix);
+ }
return std::find(kWebRequestEvents, ARRAYEND(kWebRequestEvents),
web_request_event_name) != ARRAYEND(kWebRequestEvents);
}
@@ -454,7 +456,8 @@ WebRequestAPI::WebRequestAPI(content::BrowserContext* context)
event_router->RegisterObserver(this, event_name);
// Also observe the corresponding webview event.
- event_name.replace(0, sizeof(kWebRequest) - 1, kWebView);
+ event_name.replace(
+ 0, sizeof(kWebRequestEventPrefix) - 1, webview::kWebViewEventPrefix);
event_router->RegisterObserver(this, event_name);
}
}
@@ -1466,8 +1469,10 @@ void ExtensionWebRequestEventRouter::GetMatchingListenersImpl(
ExtensionRendererState::WebViewInfo web_view_info;
bool is_web_view_guest = ExtensionRendererState::GetInstance()->
GetWebViewInfo(render_process_host_id, routing_id, &web_view_info);
- if (is_web_view_guest)
- web_request_event_name.replace(0, sizeof(kWebRequest) - 1, kWebView);
+ if (is_web_view_guest) {
+ web_request_event_name.replace(
+ 0, sizeof(kWebRequestEventPrefix) - 1, webview::kWebViewEventPrefix);
+ }
std::set<EventListener>& listeners =
listeners_[profile][web_request_event_name];