| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <cmath> | 9 #include <cmath> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 2968 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2979 if (load_state_.state == net::LOAD_STATE_READING_RESPONSE) | 2979 if (load_state_.state == net::LOAD_STATE_READING_RESPONSE) |
| 2980 SetNotWaitingForResponse(); | 2980 SetNotWaitingForResponse(); |
| 2981 if (IsLoading()) { | 2981 if (IsLoading()) { |
| 2982 NotifyNavigationStateChanged(static_cast<InvalidateTypes>( | 2982 NotifyNavigationStateChanged(static_cast<InvalidateTypes>( |
| 2983 INVALIDATE_TYPE_LOAD | INVALIDATE_TYPE_TAB)); | 2983 INVALIDATE_TYPE_LOAD | INVALIDATE_TYPE_TAB)); |
| 2984 } | 2984 } |
| 2985 } | 2985 } |
| 2986 | 2986 |
| 2987 void WebContentsImpl::DidGetResourceResponseStart( | 2987 void WebContentsImpl::DidGetResourceResponseStart( |
| 2988 const ResourceRequestDetails& details) { | 2988 const ResourceRequestDetails& details) { |
| 2989 controller_.ssl_manager()->DidStartResourceResponse(details); | 2989 controller_.ssl_manager()->DidStartResourceResponse( |
| 2990 details.url, details.has_certificate, details.ssl_cert_status); |
| 2990 | 2991 |
| 2991 FOR_EACH_OBSERVER(WebContentsObserver, observers_, | 2992 FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
| 2992 DidGetResourceResponseStart(details)); | 2993 DidGetResourceResponseStart(details)); |
| 2993 } | 2994 } |
| 2994 | 2995 |
| 2995 void WebContentsImpl::DidGetRedirectForResourceRequest( | 2996 void WebContentsImpl::DidGetRedirectForResourceRequest( |
| 2996 const ResourceRedirectDetails& details) { | 2997 const ResourceRedirectDetails& details) { |
| 2997 controller_.ssl_manager()->DidReceiveResourceRedirect(details); | |
| 2998 | |
| 2999 FOR_EACH_OBSERVER( | 2998 FOR_EACH_OBSERVER( |
| 3000 WebContentsObserver, | 2999 WebContentsObserver, |
| 3001 observers_, | 3000 observers_, |
| 3002 DidGetRedirectForResourceRequest(details)); | 3001 DidGetRedirectForResourceRequest(details)); |
| 3003 | 3002 |
| 3004 // TODO(avi): Remove. http://crbug.com/170921 | 3003 // TODO(avi): Remove. http://crbug.com/170921 |
| 3005 NotificationService::current()->Notify( | 3004 NotificationService::current()->Notify( |
| 3006 NOTIFICATION_RESOURCE_RECEIVED_REDIRECT, | 3005 NOTIFICATION_RESOURCE_RECEIVED_REDIRECT, |
| 3007 Source<WebContents>(this), | 3006 Source<WebContents>(this), |
| 3008 Details<const ResourceRedirectDetails>(&details)); | 3007 Details<const ResourceRedirectDetails>(&details)); |
| (...skipping 2258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5267 dialog_manager_ = dialog_manager; | 5266 dialog_manager_ = dialog_manager; |
| 5268 } | 5267 } |
| 5269 | 5268 |
| 5270 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) { | 5269 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) { |
| 5271 auto it = binding_sets_.find(interface_name); | 5270 auto it = binding_sets_.find(interface_name); |
| 5272 if (it != binding_sets_.end()) | 5271 if (it != binding_sets_.end()) |
| 5273 binding_sets_.erase(it); | 5272 binding_sets_.erase(it); |
| 5274 } | 5273 } |
| 5275 | 5274 |
| 5276 } // namespace content | 5275 } // namespace content |
| OLD | NEW |