summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/web_request
diff options
context:
space:
mode:
authorhanxi@chromium.org <hanxi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-12 18:26:46 +0000
committerhanxi@chromium.org <hanxi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-12 18:26:46 +0000
commit07b1ebcbbb5371f6b9f854191b2196ad02f776b8 (patch)
tree64aa416c3480d4acb35f85b2f22b6a736f60dfc0 /chrome/browser/extensions/api/web_request
parent5855814efdad4a6cdd5395a59dd5fb7ebc9618db (diff)
downloadchromium_src-07b1ebcbbb5371f6b9f854191b2196ad02f776b8.zip
chromium_src-07b1ebcbbb5371f6b9f854191b2196ad02f776b8.tar.gz
chromium_src-07b1ebcbbb5371f6b9f854191b2196ad02f776b8.tar.bz2
Move guest_view to extensions.
1. Update guest_view_manager_unittest.cc. 2. Move guest_view code to extensions. 3. Add namespace extensions for classes within guest_view/web_view/app_view. BUG=352290 Review URL: https://codereview.chromium.org/464533002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289030 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.cc17
-rw-r--r--chrome/browser/extensions/api/web_request/web_request_permissions.cc2
2 files changed, 10 insertions, 9 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 80690a0..5d2ff09 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api.cc
@@ -185,12 +185,13 @@ void ExtractRequestRoutingInfo(net::URLRequest* request,
// a <webview> guest process or not. If it is from a <webview> guest process,
// then |web_view_info| is returned with information about the instance ID
// that uniquely identifies the <webview> and its embedder.
-bool GetWebViewInfo(net::URLRequest* request,
- WebViewRendererState::WebViewInfo* web_view_info) {
+bool GetWebViewInfo(
+ net::URLRequest* request,
+ extensions::WebViewRendererState::WebViewInfo* web_view_info) {
int render_process_host_id = -1;
int routing_id = -1;
ExtractRequestRoutingInfo(request, &render_process_host_id, &routing_id);
- return WebViewRendererState::GetInstance()->
+ return extensions::WebViewRendererState::GetInstance()->
GetInfo(render_process_host_id, routing_id, web_view_info);
}
@@ -406,7 +407,7 @@ void SendOnMessageEventOnUI(
void* profile_id,
const std::string& extension_id,
bool is_web_view_guest,
- const WebViewRendererState::WebViewInfo& web_view_info,
+ const extensions::WebViewRendererState::WebViewInfo& web_view_info,
scoped_ptr<base::DictionaryValue> event_argument) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -1471,8 +1472,8 @@ void ExtensionWebRequestEventRouter::GetMatchingListenersImpl(
std::vector<const ExtensionWebRequestEventRouter::EventListener*>*
matching_listeners) {
std::string web_request_event_name(event_name);
- WebViewRendererState::WebViewInfo web_view_info;
- bool is_web_view_guest = WebViewRendererState::GetInstance()->
+ extensions::WebViewRendererState::WebViewInfo web_view_info;
+ bool is_web_view_guest = extensions::WebViewRendererState::GetInstance()->
GetInfo(render_process_host_id, routing_id, &web_view_info);
if (is_web_view_guest) {
web_request_event_name.replace(
@@ -1848,7 +1849,7 @@ void ExtensionWebRequestEventRouter::SendMessages(
message != messages.end(); ++message) {
scoped_ptr<base::DictionaryValue> argument(new base::DictionaryValue);
ExtractRequestInfo(blocked_request.request, argument.get());
- WebViewRendererState::WebViewInfo web_view_info;
+ extensions::WebViewRendererState::WebViewInfo web_view_info;
bool is_web_view_guest = GetWebViewInfo(blocked_request.request,
&web_view_info);
argument->SetString(keys::kMessageKey, *message);
@@ -1977,7 +1978,7 @@ bool ExtensionWebRequestEventRouter::ProcessDeclarativeRules(
net::URLRequest* request,
extensions::RequestStage request_stage,
const net::HttpResponseHeaders* original_response_headers) {
- WebViewRendererState::WebViewInfo web_view_info;
+ extensions::WebViewRendererState::WebViewInfo web_view_info;
bool is_web_view_guest = GetWebViewInfo(request, &web_view_info);
RulesRegistryService::WebViewKey webview_key(
diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions.cc b/chrome/browser/extensions/api/web_request/web_request_permissions.cc
index c3d4718a..d343110 100644
--- a/chrome/browser/extensions/api/web_request/web_request_permissions.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_permissions.cc
@@ -86,7 +86,7 @@ bool WebRequestPermissions::HideRequest(
if (info) {
int process_id = info->GetChildID();
// Never hide requests from guest processes.
- if (WebViewRendererState::GetInstance()->IsGuest(process_id))
+ if (extensions::WebViewRendererState::GetInstance()->IsGuest(process_id))
return false;
if (extension_info_map && (