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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
330 this, content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT, | 330 this, content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT, |
331 content::Source<WebContents>(prerender_contents_.get())); | 331 content::Source<WebContents>(prerender_contents_.get())); |
332 | 332 |
333 // Transfer over the user agent override. | 333 // Transfer over the user agent override. |
334 prerender_contents_.get()->SetUserAgentOverride( | 334 prerender_contents_.get()->SetUserAgentOverride( |
335 prerender_manager_->config().user_agent_override); | 335 prerender_manager_->config().user_agent_override); |
336 | 336 |
337 content::NavigationController::LoadURLParams load_url_params( | 337 content::NavigationController::LoadURLParams load_url_params( |
338 prerender_url_); | 338 prerender_url_); |
339 load_url_params.referrer = referrer_; | 339 load_url_params.referrer = referrer_; |
340 load_url_params.transition_type = (origin_ == ORIGIN_OMNIBOX ? | 340 content::PageTransition transition_type_no_qualifier = |
341 content::PAGE_TRANSITION_TYPED : content::PAGE_TRANSITION_LINK); | 341 origin_ == ORIGIN_OMNIBOX ? |
342 content::PAGE_TRANSITION_TYPED : content::PAGE_TRANSITION_LINK; | |
jar (doing other things)
2013/08/01 22:56:47
nit: The old format was bad... your format is bett
kouhei (in TOK)
2013/08/02 06:18:03
Done.
| |
343 load_url_params.transition_type = content::PageTransitionFromInt( | |
344 transition_type_no_qualifier | content::PAGE_TRANSITION_PRERENDER); | |
342 load_url_params.override_user_agent = | 345 load_url_params.override_user_agent = |
343 prerender_manager_->config().is_overriding_user_agent ? | 346 prerender_manager_->config().is_overriding_user_agent ? |
344 content::NavigationController::UA_OVERRIDE_TRUE : | 347 content::NavigationController::UA_OVERRIDE_TRUE : |
345 content::NavigationController::UA_OVERRIDE_FALSE; | 348 content::NavigationController::UA_OVERRIDE_FALSE; |
346 prerender_contents_.get()->GetController().LoadURLWithParams(load_url_params); | 349 prerender_contents_.get()->GetController().LoadURLWithParams(load_url_params); |
347 } | 350 } |
348 | 351 |
349 bool PrerenderContents::GetChildId(int* child_id) const { | 352 bool PrerenderContents::GetChildId(int* child_id) const { |
350 CHECK(child_id); | 353 CHECK(child_id); |
351 DCHECK_GE(child_id_, -1); | 354 DCHECK_GE(child_id_, -1); |
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
720 | 723 |
721 bool PrerenderContents::IsCrossSiteNavigationPending() const { | 724 bool PrerenderContents::IsCrossSiteNavigationPending() const { |
722 if (!prerender_contents_) | 725 if (!prerender_contents_) |
723 return false; | 726 return false; |
724 return (prerender_contents_->GetSiteInstance() != | 727 return (prerender_contents_->GetSiteInstance() != |
725 prerender_contents_->GetPendingSiteInstance()); | 728 prerender_contents_->GetPendingSiteInstance()); |
726 } | 729 } |
727 | 730 |
728 | 731 |
729 } // namespace prerender | 732 } // namespace prerender |
OLD | NEW |