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

Side by Side Diff: chrome/browser/ui/browser_navigator.cc

Issue 743773003: OOPIF: Data URLs are now rendered in the renderer that initiated the navigation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixing android compile Created 6 years 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
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/ui/browser_navigator.h" 5 #include "chrome/browser/ui/browser_navigator.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 params->source_contents->GetBrowserContext()); 252 params->source_contents->GetBrowserContext());
253 } 253 }
254 254
255 return params->initiating_profile; 255 return params->initiating_profile;
256 } 256 }
257 257
258 void LoadURLInContents(WebContents* target_contents, 258 void LoadURLInContents(WebContents* target_contents,
259 const GURL& url, 259 const GURL& url,
260 chrome::NavigateParams* params) { 260 chrome::NavigateParams* params) {
261 NavigationController::LoadURLParams load_url_params(url); 261 NavigationController::LoadURLParams load_url_params(url);
262 load_url_params.source_site_instance = params->source_site_instance;
262 load_url_params.referrer = params->referrer; 263 load_url_params.referrer = params->referrer;
263 load_url_params.frame_tree_node_id = params->frame_tree_node_id; 264 load_url_params.frame_tree_node_id = params->frame_tree_node_id;
264 load_url_params.redirect_chain = params->redirect_chain; 265 load_url_params.redirect_chain = params->redirect_chain;
265 load_url_params.transition_type = params->transition; 266 load_url_params.transition_type = params->transition;
266 load_url_params.extra_headers = params->extra_headers; 267 load_url_params.extra_headers = params->extra_headers;
267 load_url_params.should_replace_current_entry = 268 load_url_params.should_replace_current_entry =
268 params->should_replace_current_entry; 269 params->should_replace_current_entry;
269 270
270 if (params->transferred_global_request_id != GlobalRequestID()) { 271 if (params->transferred_global_request_id != GlobalRequestID()) {
271 load_url_params.is_renderer_initiated = params->is_renderer_initiated; 272 load_url_params.is_renderer_initiated = params->is_renderer_initiated;
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 host_desktop_type(chrome::GetActiveDesktop()), 479 host_desktop_type(chrome::GetActiveDesktop()),
479 should_replace_current_entry(false), 480 should_replace_current_entry(false),
480 should_set_opener(false) { 481 should_set_opener(false) {
481 } 482 }
482 483
483 NavigateParams::~NavigateParams() {} 484 NavigateParams::~NavigateParams() {}
484 485
485 void FillNavigateParamsFromOpenURLParams(chrome::NavigateParams* nav_params, 486 void FillNavigateParamsFromOpenURLParams(chrome::NavigateParams* nav_params,
486 const content::OpenURLParams& params) { 487 const content::OpenURLParams& params) {
487 nav_params->referrer = params.referrer; 488 nav_params->referrer = params.referrer;
489 nav_params->source_site_instance = params.source_site_instance;
488 nav_params->frame_tree_node_id = params.frame_tree_node_id; 490 nav_params->frame_tree_node_id = params.frame_tree_node_id;
489 nav_params->redirect_chain = params.redirect_chain; 491 nav_params->redirect_chain = params.redirect_chain;
490 nav_params->extra_headers = params.extra_headers; 492 nav_params->extra_headers = params.extra_headers;
491 nav_params->disposition = params.disposition; 493 nav_params->disposition = params.disposition;
492 nav_params->trusted_source = false; 494 nav_params->trusted_source = false;
493 nav_params->is_renderer_initiated = params.is_renderer_initiated; 495 nav_params->is_renderer_initiated = params.is_renderer_initiated;
494 nav_params->transferred_global_request_id = 496 nav_params->transferred_global_request_id =
495 params.transferred_global_request_id; 497 params.transferred_global_request_id;
496 nav_params->should_replace_current_entry = 498 nav_params->should_replace_current_entry =
497 params.should_replace_current_entry; 499 params.should_replace_current_entry;
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 bool reverse_on_redirect = false; 771 bool reverse_on_redirect = false;
770 content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary( 772 content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
771 &rewritten_url, browser_context, &reverse_on_redirect); 773 &rewritten_url, browser_context, &reverse_on_redirect);
772 774
773 // Some URLs are mapped to uber subpages. Do not allow them in incognito. 775 // Some URLs are mapped to uber subpages. Do not allow them in incognito.
774 return !(rewritten_url.scheme() == content::kChromeUIScheme && 776 return !(rewritten_url.scheme() == content::kChromeUIScheme &&
775 rewritten_url.host() == chrome::kChromeUIUberHost); 777 rewritten_url.host() == chrome::kChromeUIUberHost);
776 } 778 }
777 779
778 } // namespace chrome 780 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_navigator.h ('k') | content/browser/frame_host/navigation_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698