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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 this, content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT, | 325 this, content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT, |
326 content::Source<WebContents>(prerender_contents_.get())); | 326 content::Source<WebContents>(prerender_contents_.get())); |
327 | 327 |
328 // Transfer over the user agent override. | 328 // Transfer over the user agent override. |
329 prerender_contents_.get()->SetUserAgentOverride( | 329 prerender_contents_.get()->SetUserAgentOverride( |
330 prerender_manager_->config().user_agent_override); | 330 prerender_manager_->config().user_agent_override); |
331 | 331 |
332 content::NavigationController::LoadURLParams load_url_params( | 332 content::NavigationController::LoadURLParams load_url_params( |
333 prerender_url_); | 333 prerender_url_); |
334 load_url_params.referrer = referrer_; | 334 load_url_params.referrer = referrer_; |
335 load_url_params.transition_type = (origin_ == ORIGIN_OMNIBOX ? | 335 content::PageTransition transition_type_no_qualifier = |
336 content::PAGE_TRANSITION_TYPED : content::PAGE_TRANSITION_LINK); | 336 origin_ == ORIGIN_OMNIBOX ? |
| 337 content::PAGE_TRANSITION_TYPED : content::PAGE_TRANSITION_LINK; |
| 338 load_url_params.transition_type = content::PageTransitionFromInt( |
| 339 transition_type_no_qualifier | content::PAGE_TRANSITION_PRERENDER); |
337 load_url_params.override_user_agent = | 340 load_url_params.override_user_agent = |
338 prerender_manager_->config().is_overriding_user_agent ? | 341 prerender_manager_->config().is_overriding_user_agent ? |
339 content::NavigationController::UA_OVERRIDE_TRUE : | 342 content::NavigationController::UA_OVERRIDE_TRUE : |
340 content::NavigationController::UA_OVERRIDE_FALSE; | 343 content::NavigationController::UA_OVERRIDE_FALSE; |
341 prerender_contents_.get()->GetController().LoadURLWithParams(load_url_params); | 344 prerender_contents_.get()->GetController().LoadURLWithParams(load_url_params); |
342 } | 345 } |
343 | 346 |
344 bool PrerenderContents::GetChildId(int* child_id) const { | 347 bool PrerenderContents::GetChildId(int* child_id) const { |
345 CHECK(child_id); | 348 CHECK(child_id); |
346 DCHECK_GE(child_id_, -1); | 349 DCHECK_GE(child_id_, -1); |
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
715 | 718 |
716 bool PrerenderContents::IsCrossSiteNavigationPending() const { | 719 bool PrerenderContents::IsCrossSiteNavigationPending() const { |
717 if (!prerender_contents_) | 720 if (!prerender_contents_) |
718 return false; | 721 return false; |
719 return (prerender_contents_->GetSiteInstance() != | 722 return (prerender_contents_->GetSiteInstance() != |
720 prerender_contents_->GetPendingSiteInstance()); | 723 prerender_contents_->GetPendingSiteInstance()); |
721 } | 724 } |
722 | 725 |
723 | 726 |
724 } // namespace prerender | 727 } // namespace prerender |
OLD | NEW |