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

Side by Side Diff: content/shell/browser/shell.cc

Issue 77673003: Add frame_tree_node_id to navigation parameters. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comments Created 7 years, 1 month 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 | « content/public/browser/page_navigator.cc ('k') | 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/shell/browser/shell.h" 5 #include "content/shell/browser/shell.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 return web_contents_->GetView()->GetNativeView(); 241 return web_contents_->GetView()->GetNativeView();
242 } 242 }
243 243
244 WebContents* Shell::OpenURLFromTab(WebContents* source, 244 WebContents* Shell::OpenURLFromTab(WebContents* source,
245 const OpenURLParams& params) { 245 const OpenURLParams& params) {
246 // CURRENT_TAB is the only one we implement for now. 246 // CURRENT_TAB is the only one we implement for now.
247 if (params.disposition != CURRENT_TAB) 247 if (params.disposition != CURRENT_TAB)
248 return NULL; 248 return NULL;
249 NavigationController::LoadURLParams load_url_params(params.url); 249 NavigationController::LoadURLParams load_url_params(params.url);
250 load_url_params.referrer = params.referrer; 250 load_url_params.referrer = params.referrer;
251 load_url_params.frame_tree_node_id = params.frame_tree_node_id;
251 load_url_params.transition_type = params.transition; 252 load_url_params.transition_type = params.transition;
252 load_url_params.extra_headers = params.extra_headers; 253 load_url_params.extra_headers = params.extra_headers;
253 load_url_params.should_replace_current_entry = 254 load_url_params.should_replace_current_entry =
254 params.should_replace_current_entry; 255 params.should_replace_current_entry;
255 256
256 if (params.transferred_global_request_id != GlobalRequestID()) { 257 if (params.transferred_global_request_id != GlobalRequestID()) {
257 load_url_params.is_renderer_initiated = params.is_renderer_initiated; 258 load_url_params.is_renderer_initiated = params.is_renderer_initiated;
258 load_url_params.transferred_global_request_id = 259 load_url_params.transferred_global_request_id =
259 params.transferred_global_request_id; 260 params.transferred_global_request_id;
260 } else if (params.is_renderer_initiated) { 261 } else if (params.is_renderer_initiated) {
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 if (entry) 352 if (entry)
352 PlatformSetTitle(entry->GetTitle()); 353 PlatformSetTitle(entry->GetTitle());
353 } 354 }
354 355
355 void Shell::OnDevToolsWebContentsDestroyed() { 356 void Shell::OnDevToolsWebContentsDestroyed() {
356 devtools_observer_.reset(); 357 devtools_observer_.reset();
357 devtools_frontend_ = NULL; 358 devtools_frontend_ = NULL;
358 } 359 }
359 360
360 } // namespace content 361 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/page_navigator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698