Chromium Code Reviews| 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 "chrome/browser/prerender/prerender_contents.h" | 5 #include "chrome/browser/prerender/prerender_contents.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <functional> | 8 #include <functional> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 319 this, content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT, | 319 this, content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT, |
| 320 content::Source<WebContents>(prerender_contents_.get())); | 320 content::Source<WebContents>(prerender_contents_.get())); |
| 321 | 321 |
| 322 // Transfer over the user agent override. | 322 // Transfer over the user agent override. |
| 323 prerender_contents_.get()->SetUserAgentOverride( | 323 prerender_contents_.get()->SetUserAgentOverride( |
| 324 prerender_manager_->config().user_agent_override); | 324 prerender_manager_->config().user_agent_override); |
| 325 | 325 |
| 326 content::NavigationController::LoadURLParams load_url_params( | 326 content::NavigationController::LoadURLParams load_url_params( |
| 327 prerender_url_); | 327 prerender_url_); |
| 328 load_url_params.referrer = referrer_; | 328 load_url_params.referrer = referrer_; |
| 329 load_url_params.transition_type = (origin_ == ORIGIN_OMNIBOX ? | 329 load_url_params.transition_type = content::PageTransitionFromInt( |
| 330 content::PAGE_TRANSITION_TYPED : content::PAGE_TRANSITION_LINK); | 330 (origin_ == ORIGIN_OMNIBOX ? |
| 331 content::PAGE_TRANSITION_TYPED : content::PAGE_TRANSITION_LINK) | | |
| 332 content::PAGE_TRANSITION_PRERENDER); | |
|
jar (doing other things)
2013/06/18 01:33:49
nit: please use a temp variable for this argument
kouhei (in TOK)
2013/06/18 22:28:41
Done.
| |
| 331 load_url_params.override_user_agent = | 333 load_url_params.override_user_agent = |
| 332 prerender_manager_->config().is_overriding_user_agent ? | 334 prerender_manager_->config().is_overriding_user_agent ? |
| 333 content::NavigationController::UA_OVERRIDE_TRUE : | 335 content::NavigationController::UA_OVERRIDE_TRUE : |
| 334 content::NavigationController::UA_OVERRIDE_FALSE; | 336 content::NavigationController::UA_OVERRIDE_FALSE; |
| 335 prerender_contents_.get()->GetController().LoadURLWithParams(load_url_params); | 337 prerender_contents_.get()->GetController().LoadURLWithParams(load_url_params); |
| 336 } | 338 } |
| 337 | 339 |
| 338 bool PrerenderContents::GetChildId(int* child_id) const { | 340 bool PrerenderContents::GetChildId(int* child_id) const { |
| 339 CHECK(child_id); | 341 CHECK(child_id); |
| 340 DCHECK_GE(child_id_, -1); | 342 DCHECK_GE(child_id_, -1); |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 709 | 711 |
| 710 bool PrerenderContents::IsCrossSiteNavigationPending() const { | 712 bool PrerenderContents::IsCrossSiteNavigationPending() const { |
| 711 if (!prerender_contents_) | 713 if (!prerender_contents_) |
| 712 return false; | 714 return false; |
| 713 return (prerender_contents_->GetSiteInstance() != | 715 return (prerender_contents_->GetSiteInstance() != |
| 714 prerender_contents_->GetPendingSiteInstance()); | 716 prerender_contents_->GetPendingSiteInstance()); |
| 715 } | 717 } |
| 716 | 718 |
| 717 | 719 |
| 718 } // namespace prerender | 720 } // namespace prerender |
| OLD | NEW |