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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 387703004: Navigation transitions: Parse out transition-entering-stylesheet link headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit fix Created 6 years, 5 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
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 3497 matching lines...) Expand 10 before | Expand all | Expand 10 after
3508 // Ignore this if it comes from a RenderViewHost that we aren't showing. 3508 // Ignore this if it comes from a RenderViewHost that we aren't showing.
3509 if (delegate_ && rvh == GetRenderViewHost()) 3509 if (delegate_ && rvh == GetRenderViewHost())
3510 delegate_->CloseContents(this); 3510 delegate_->CloseContents(this);
3511 } 3511 }
3512 3512
3513 void WebContentsImpl::SwappedOut(RenderFrameHost* rfh) { 3513 void WebContentsImpl::SwappedOut(RenderFrameHost* rfh) {
3514 if (delegate_ && rfh->GetRenderViewHost() == GetRenderViewHost()) 3514 if (delegate_ && rfh->GetRenderViewHost() == GetRenderViewHost())
3515 delegate_->SwappedOut(this); 3515 delegate_->SwappedOut(this);
3516 } 3516 }
3517 3517
3518 void WebContentsImpl::DidDeferAfterResponseStarted() { 3518 void WebContentsImpl::DidDeferAfterResponseStarted(
3519 const scoped_refptr<net::HttpResponseHeaders>& headers,
3520 const GURL& url) {
3519 #if defined(OS_ANDROID) 3521 #if defined(OS_ANDROID)
3520 ContentViewCoreImpl::FromWebContents(this)->DidDeferAfterResponseStarted(); 3522 ContentViewCoreImpl::FromWebContents(this)->DidDeferAfterResponseStarted(
3523 headers, url);
3521 #endif 3524 #endif
3522 } 3525 }
3523 3526
3524 bool WebContentsImpl::WillHandleDeferAfterResponseStarted() { 3527 bool WebContentsImpl::WillHandleDeferAfterResponseStarted() {
3525 #if defined(OS_ANDROID) 3528 #if defined(OS_ANDROID)
3526 return ContentViewCoreImpl::FromWebContents(this)-> 3529 return ContentViewCoreImpl::FromWebContents(this)->
3527 WillHandleDeferAfterResponseStarted(); 3530 WillHandleDeferAfterResponseStarted();
3528 #else 3531 #else
3529 return false; 3532 return false;
3530 #endif 3533 #endif
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
4135 if (new_size != old_size) 4138 if (new_size != old_size)
4136 delegate_->UpdatePreferredSize(this, new_size); 4139 delegate_->UpdatePreferredSize(this, new_size);
4137 } 4140 }
4138 4141
4139 void WebContentsImpl::ResumeResponseDeferredAtStart() { 4142 void WebContentsImpl::ResumeResponseDeferredAtStart() {
4140 FrameTreeNode* node = frame_tree_.root(); 4143 FrameTreeNode* node = frame_tree_.root();
4141 node->render_manager()->ResumeResponseDeferredAtStart(); 4144 node->render_manager()->ResumeResponseDeferredAtStart();
4142 } 4145 }
4143 4146
4144 } // namespace content 4147 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698