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

Side by Side Diff: content/browser/loader/navigation_resource_handler.cc

Issue 2400673003: Remove SSLStatus::security_style member and content::SecurityStyle (Closed)
Patch Set: more curly braces Created 4 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 "content/browser/loader/navigation_resource_handler.h" 5 #include "content/browser/loader/navigation_resource_handler.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "content/browser/loader/navigation_url_loader_impl_core.h" 10 #include "content/browser/loader/navigation_url_loader_impl_core.h"
11 #include "content/browser/loader/netlog_observer.h" 11 #include "content/browser/loader/netlog_observer.h"
12 #include "content/browser/loader/resource_loader.h" 12 #include "content/browser/loader/resource_loader.h"
13 #include "content/browser/loader/resource_request_info_impl.h" 13 #include "content/browser/loader/resource_request_info_impl.h"
14 #include "content/browser/resource_context_impl.h" 14 #include "content/browser/resource_context_impl.h"
15 #include "content/browser/streams/stream.h" 15 #include "content/browser/streams/stream.h"
16 #include "content/browser/streams/stream_context.h" 16 #include "content/browser/streams/stream_context.h"
17 #include "content/common/security_style_util.h"
18 #include "content/public/browser/navigation_data.h" 17 #include "content/public/browser/navigation_data.h"
19 #include "content/public/browser/resource_controller.h" 18 #include "content/public/browser/resource_controller.h"
20 #include "content/public/browser/resource_dispatcher_host_delegate.h" 19 #include "content/public/browser/resource_dispatcher_host_delegate.h"
21 #include "content/public/browser/ssl_status.h" 20 #include "content/public/browser/ssl_status.h"
22 #include "content/public/browser/stream_handle.h" 21 #include "content/public/browser/stream_handle.h"
23 #include "content/public/common/resource_response.h" 22 #include "content/public/common/resource_response.h"
24 #include "net/base/net_errors.h" 23 #include "net/base/net_errors.h"
25 #include "net/url_request/url_request.h" 24 #include "net/url_request/url_request.h"
26 25
27 namespace content { 26 namespace content {
28 27
29 void NavigationResourceHandler::GetSSLStatusForRequest( 28 void NavigationResourceHandler::GetSSLStatusForRequest(
30 const GURL& url, 29 const GURL& url,
31 const net::SSLInfo& ssl_info, 30 const net::SSLInfo& ssl_info,
32 int child_id, 31 int child_id,
33 SSLStatus* ssl_status) { 32 SSLStatus* ssl_status) {
34 DCHECK(ssl_info.cert); 33 DCHECK(ssl_info.cert);
35 *ssl_status = SSLStatus(GetSecurityStyleForResource( 34 *ssl_status = SSLStatus(ssl_info.cert, ssl_info);
36 url, !!ssl_info.cert, ssl_info.cert_status),
37 ssl_info.cert, ssl_info);
38 } 35 }
39 36
40 NavigationResourceHandler::NavigationResourceHandler( 37 NavigationResourceHandler::NavigationResourceHandler(
41 net::URLRequest* request, 38 net::URLRequest* request,
42 NavigationURLLoaderImplCore* core, 39 NavigationURLLoaderImplCore* core,
43 ResourceDispatcherHostDelegate* resource_dispatcher_host_delegate) 40 ResourceDispatcherHostDelegate* resource_dispatcher_host_delegate)
44 : ResourceHandler(request), 41 : ResourceHandler(request),
45 core_(core), 42 core_(core),
46 resource_dispatcher_host_delegate_(resource_dispatcher_host_delegate) { 43 resource_dispatcher_host_delegate_(resource_dispatcher_host_delegate) {
47 core_->set_resource_handler(this); 44 core_->set_resource_handler(this);
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 NOTREACHED(); 178 NOTREACHED();
182 } 179 }
183 180
184 void NavigationResourceHandler::DetachFromCore() { 181 void NavigationResourceHandler::DetachFromCore() {
185 DCHECK(core_); 182 DCHECK(core_);
186 core_->set_resource_handler(nullptr); 183 core_->set_resource_handler(nullptr);
187 core_ = nullptr; 184 core_ = nullptr;
188 } 185 }
189 186
190 } // namespace content 187 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698