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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2239273002: Don't use SSLStatus from FrameHostMsg_DidCommitProvisionalLoad and instead cache it on the browser … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: slight cleanup Created 4 years, 4 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 2610 matching lines...) Expand 10 before | Expand all | Expand 10 after
2621 is_loading_ = false; 2621 is_loading_ = false;
2622 else 2622 else
2623 OnDidStopLoading(); 2623 OnDidStopLoading();
2624 } 2624 }
2625 } 2625 }
2626 2626
2627 void RenderFrameHostImpl::SuppressFurtherDialogs() { 2627 void RenderFrameHostImpl::SuppressFurtherDialogs() {
2628 Send(new FrameMsg_SuppressFurtherDialogs(GetRoutingID())); 2628 Send(new FrameMsg_SuppressFurtherDialogs(GetRoutingID()));
2629 } 2629 }
2630 2630
2631 void RenderFrameHostImpl::SetSSLStatusForPendingNavigate(
2632 const GURL& url, const SSLStatus& ssl_status) {
2633 pending_navigate_ssl_status_url_ = url;
2634 pending_navigate_ssl_status_ = ssl_status;
2635 }
2636
2637 bool RenderFrameHostImpl::GetSSLStatusForPendingNavigate(
2638 const GURL& url, SSLStatus* status) {
2639 bool rv = false;
2640 if (url == pending_navigate_ssl_status_url_) {
2641 *status = pending_navigate_ssl_status_;
2642 rv = true;
2643 }
2644 pending_navigate_ssl_status_url_ = GURL();
2645 pending_navigate_ssl_status_ = SSLStatus();
2646 return rv;
2647 }
2648
2631 bool RenderFrameHostImpl::IsSameSiteInstance( 2649 bool RenderFrameHostImpl::IsSameSiteInstance(
2632 RenderFrameHostImpl* other_render_frame_host) { 2650 RenderFrameHostImpl* other_render_frame_host) {
2633 // As a sanity check, make sure the frame belongs to the same BrowserContext. 2651 // As a sanity check, make sure the frame belongs to the same BrowserContext.
2634 CHECK_EQ(GetSiteInstance()->GetBrowserContext(), 2652 CHECK_EQ(GetSiteInstance()->GetBrowserContext(),
2635 other_render_frame_host->GetSiteInstance()->GetBrowserContext()); 2653 other_render_frame_host->GetSiteInstance()->GetBrowserContext());
2636 return GetSiteInstance() == other_render_frame_host->GetSiteInstance(); 2654 return GetSiteInstance() == other_render_frame_host->GetSiteInstance();
2637 } 2655 }
2638 2656
2639 void RenderFrameHostImpl::SetAccessibilityMode(AccessibilityMode mode) { 2657 void RenderFrameHostImpl::SetAccessibilityMode(AccessibilityMode mode) {
2640 Send(new FrameMsg_SetAccessibilityMode(routing_id_, mode)); 2658 Send(new FrameMsg_SetAccessibilityMode(routing_id_, mode));
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
3035 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( 3053 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
3036 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); 3054 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
3037 return web_bluetooth_service_.get(); 3055 return web_bluetooth_service_.get();
3038 } 3056 }
3039 3057
3040 void RenderFrameHostImpl::DeleteWebBluetoothService() { 3058 void RenderFrameHostImpl::DeleteWebBluetoothService() {
3041 web_bluetooth_service_.reset(); 3059 web_bluetooth_service_.reset();
3042 } 3060 }
3043 3061
3044 } // namespace content 3062 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698