Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(323)

Side by Side Diff: extensions/shell/browser/shell_network_delegate.cc

Issue 631203003: Fix bug: AppShell: CHECK failure in PeerConnection init. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase again. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/browser/extension_network_delegate.h" 5 #include "extensions/shell/browser/shell_network_delegate.h"
6 6
7 #include "content/public/browser/render_frame_host.h" 7 #include "content/public/browser/render_frame_host.h"
8 #include "content/public/browser/resource_request_info.h" 8 #include "content/public/browser/resource_request_info.h"
9 #include "extensions/browser/api/web_request/web_request_api.h" 9 #include "extensions/browser/api/web_request/web_request_api.h"
10 #include "extensions/browser/extension_system.h" 10 #include "extensions/browser/extension_system.h"
11 #include "extensions/browser/extensions_browser_client.h" 11 #include "extensions/browser/extensions_browser_client.h"
12 #include "extensions/browser/process_manager.h" 12 #include "extensions/browser/process_manager.h"
13 #include "net/url_request/url_request.h" 13 #include "net/url_request/url_request.h"
14 14
15 namespace extensions { 15 namespace extensions {
16 16
17 namespace { 17 namespace {
18 bool g_accept_all_cookies = true; 18 bool g_accept_all_cookies = true;
19 } 19 }
20 20
21 ExtensionNetworkDelegate::ExtensionNetworkDelegate( 21 ShellNetworkDelegate::ShellNetworkDelegate(
22 void* browser_context, InfoMap* extension_info_map) { 22 void* browser_context, InfoMap* extension_info_map) {
23 browser_context_ = browser_context; 23 browser_context_ = browser_context;
24 extension_info_map_ = extension_info_map; 24 extension_info_map_ = extension_info_map;
25 } 25 }
26 26
27 ExtensionNetworkDelegate::~ExtensionNetworkDelegate() {} 27 ShellNetworkDelegate::~ShellNetworkDelegate() {}
28 28
29 void ExtensionNetworkDelegate::SetAcceptAllCookies(bool accept) { 29 void ShellNetworkDelegate::SetAcceptAllCookies(bool accept) {
30 g_accept_all_cookies = accept; 30 g_accept_all_cookies = accept;
31 } 31 }
32 32
33 int ExtensionNetworkDelegate::OnBeforeURLRequest( 33 int ShellNetworkDelegate::OnBeforeURLRequest(
34 net::URLRequest* request, 34 net::URLRequest* request,
35 const net::CompletionCallback& callback, 35 const net::CompletionCallback& callback,
36 GURL* new_url) { 36 GURL* new_url) {
37 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( 37 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
38 browser_context_, extension_info_map_.get(), request, callback, new_url); 38 browser_context_, extension_info_map_.get(), request, callback, new_url);
39 } 39 }
40 40
41 int ExtensionNetworkDelegate::OnBeforeSendHeaders( 41 int ShellNetworkDelegate::OnBeforeSendHeaders(
42 net::URLRequest* request, 42 net::URLRequest* request,
43 const net::CompletionCallback& callback, 43 const net::CompletionCallback& callback,
44 net::HttpRequestHeaders* headers) { 44 net::HttpRequestHeaders* headers) {
45 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( 45 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders(
46 browser_context_, extension_info_map_.get(), request, callback, headers); 46 browser_context_, extension_info_map_.get(), request, callback, headers);
47 } 47 }
48 48
49 void ExtensionNetworkDelegate::OnSendHeaders( 49 void ShellNetworkDelegate::OnSendHeaders(
50 net::URLRequest* request, 50 net::URLRequest* request,
51 const net::HttpRequestHeaders& headers) { 51 const net::HttpRequestHeaders& headers) {
52 ExtensionWebRequestEventRouter::GetInstance()->OnSendHeaders( 52 ExtensionWebRequestEventRouter::GetInstance()->OnSendHeaders(
53 browser_context_, extension_info_map_.get(), request, headers); 53 browser_context_, extension_info_map_.get(), request, headers);
54 } 54 }
55 55
56 int ExtensionNetworkDelegate::OnHeadersReceived( 56 int ShellNetworkDelegate::OnHeadersReceived(
57 net::URLRequest* request, 57 net::URLRequest* request,
58 const net::CompletionCallback& callback, 58 const net::CompletionCallback& callback,
59 const net::HttpResponseHeaders* original_response_headers, 59 const net::HttpResponseHeaders* original_response_headers,
60 scoped_refptr<net::HttpResponseHeaders>* override_response_headers, 60 scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
61 GURL* allowed_unsafe_redirect_url) { 61 GURL* allowed_unsafe_redirect_url) {
62 return ExtensionWebRequestEventRouter::GetInstance()->OnHeadersReceived( 62 return ExtensionWebRequestEventRouter::GetInstance()->OnHeadersReceived(
63 browser_context_, 63 browser_context_,
64 extension_info_map_.get(), 64 extension_info_map_.get(),
65 request, 65 request,
66 callback, 66 callback,
67 original_response_headers, 67 original_response_headers,
68 override_response_headers, 68 override_response_headers,
69 allowed_unsafe_redirect_url); 69 allowed_unsafe_redirect_url);
70 } 70 }
71 71
72 void ExtensionNetworkDelegate::OnBeforeRedirect( 72 void ShellNetworkDelegate::OnBeforeRedirect(
73 net::URLRequest* request, 73 net::URLRequest* request,
74 const GURL& new_location) { 74 const GURL& new_location) {
75 ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRedirect( 75 ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRedirect(
76 browser_context_, extension_info_map_.get(), request, new_location); 76 browser_context_, extension_info_map_.get(), request, new_location);
77 } 77 }
78 78
79 79
80 void ExtensionNetworkDelegate::OnResponseStarted( 80 void ShellNetworkDelegate::OnResponseStarted(
81 net::URLRequest* request) { 81 net::URLRequest* request) {
82 ExtensionWebRequestEventRouter::GetInstance()->OnResponseStarted( 82 ExtensionWebRequestEventRouter::GetInstance()->OnResponseStarted(
83 browser_context_, extension_info_map_.get(), request); 83 browser_context_, extension_info_map_.get(), request);
84 } 84 }
85 85
86 void ExtensionNetworkDelegate::OnCompleted( 86 void ShellNetworkDelegate::OnCompleted(
87 net::URLRequest* request, 87 net::URLRequest* request,
88 bool started) { 88 bool started) {
89 if (request->status().status() == net::URLRequestStatus::SUCCESS) { 89 if (request->status().status() == net::URLRequestStatus::SUCCESS) {
90 bool is_redirect = request->response_headers() && 90 bool is_redirect = request->response_headers() &&
91 net::HttpResponseHeaders::IsRedirectResponseCode( 91 net::HttpResponseHeaders::IsRedirectResponseCode(
92 request->response_headers()->response_code()); 92 request->response_headers()->response_code());
93 if (!is_redirect) { 93 if (!is_redirect) {
94 ExtensionWebRequestEventRouter::GetInstance()->OnCompleted( 94 ExtensionWebRequestEventRouter::GetInstance()->OnCompleted(
95 browser_context_, extension_info_map_.get(), request); 95 browser_context_, extension_info_map_.get(), request);
96 } 96 }
97 return; 97 return;
98 } 98 }
99 99
100 if (request->status().status() == net::URLRequestStatus::FAILED || 100 if (request->status().status() == net::URLRequestStatus::FAILED ||
101 request->status().status() == net::URLRequestStatus::CANCELED) { 101 request->status().status() == net::URLRequestStatus::CANCELED) {
102 ExtensionWebRequestEventRouter::GetInstance()->OnErrorOccurred( 102 ExtensionWebRequestEventRouter::GetInstance()->OnErrorOccurred(
103 browser_context_, extension_info_map_.get(), request, started); 103 browser_context_, extension_info_map_.get(), request, started);
104 return; 104 return;
105 } 105 }
106 106
107 NOTREACHED(); 107 NOTREACHED();
108 } 108 }
109 109
110 void ExtensionNetworkDelegate::OnURLRequestDestroyed( 110 void ShellNetworkDelegate::OnURLRequestDestroyed(
111 net::URLRequest* request) { 111 net::URLRequest* request) {
112 ExtensionWebRequestEventRouter::GetInstance()->OnURLRequestDestroyed( 112 ExtensionWebRequestEventRouter::GetInstance()->OnURLRequestDestroyed(
113 browser_context_, request); 113 browser_context_, request);
114 } 114 }
115 115
116 void ExtensionNetworkDelegate::OnPACScriptError( 116 void ShellNetworkDelegate::OnPACScriptError(
117 int line_number, 117 int line_number,
118 const base::string16& error) { 118 const base::string16& error) {
119 } 119 }
120 120
121 net::NetworkDelegate::AuthRequiredResponse 121 net::NetworkDelegate::AuthRequiredResponse
122 ExtensionNetworkDelegate::OnAuthRequired( 122 ShellNetworkDelegate::OnAuthRequired(
123 net::URLRequest* request, 123 net::URLRequest* request,
124 const net::AuthChallengeInfo& auth_info, 124 const net::AuthChallengeInfo& auth_info,
125 const AuthCallback& callback, 125 const AuthCallback& callback,
126 net::AuthCredentials* credentials) { 126 net::AuthCredentials* credentials) {
127 return ExtensionWebRequestEventRouter::GetInstance()->OnAuthRequired( 127 return ExtensionWebRequestEventRouter::GetInstance()->OnAuthRequired(
128 browser_context_, extension_info_map_.get(), request, auth_info, callback, 128 browser_context_, extension_info_map_.get(), request, auth_info, callback,
129 credentials); 129 credentials);
130 } 130 }
131 131
132 } // namespace extensions 132 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_network_delegate.h ('k') | extensions/shell/browser/shell_url_request_context_getter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698