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

Side by Side Diff: chrome/browser/prerender/prerender_contents.cc

Issue 23475040: Add transition type qualifier to prerendered pages from omnibox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, handle ORIGIN_INSTANT too Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 "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
330 content::Source<WebContents>(prerender_contents_.get())); 330 content::Source<WebContents>(prerender_contents_.get()));
331 331
332 // Transfer over the user agent override. 332 // Transfer over the user agent override.
333 prerender_contents_.get()->SetUserAgentOverride( 333 prerender_contents_.get()->SetUserAgentOverride(
334 prerender_manager_->config().user_agent_override); 334 prerender_manager_->config().user_agent_override);
335 335
336 content::NavigationController::LoadURLParams load_url_params( 336 content::NavigationController::LoadURLParams load_url_params(
337 prerender_url_); 337 prerender_url_);
338 load_url_params.referrer = referrer_; 338 load_url_params.referrer = referrer_;
339 load_url_params.transition_type = 339 load_url_params.transition_type =
340 ((origin_ == ORIGIN_OMNIBOX || origin_ == ORIGIN_INSTANT) ? 340 (origin_ == ORIGIN_OMNIBOX || origin_ == ORIGIN_INSTANT)
341 content::PAGE_TRANSITION_TYPED : content::PAGE_TRANSITION_LINK); 341 ? content::PageTransitionFromInt(
342 content::PAGE_TRANSITION_TYPED |
343 content::PAGE_TRANSITION_FROM_ADDRESS_BAR)
344 : content::PAGE_TRANSITION_LINK;
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 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 return NULL; 771 return NULL;
769 return prerender_contents()->GetController(). 772 return prerender_contents()->GetController().
770 GetDefaultSessionStorageNamespace(); 773 GetDefaultSessionStorageNamespace();
771 } 774 }
772 775
773 void PrerenderContents::OnCancelPrerenderForPrinting() { 776 void PrerenderContents::OnCancelPrerenderForPrinting() {
774 Destroy(FINAL_STATUS_WINDOW_PRINT); 777 Destroy(FINAL_STATUS_WINDOW_PRINT);
775 } 778 }
776 779
777 } // namespace prerender 780 } // namespace prerender
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698