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

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

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 3 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
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 306
307 gfx::NativeView Shell::GetContentView() { 307 gfx::NativeView Shell::GetContentView() {
308 if (!web_contents_) 308 if (!web_contents_)
309 return NULL; 309 return NULL;
310 return web_contents_->GetNativeView(); 310 return web_contents_->GetNativeView();
311 } 311 }
312 312
313 WebContents* Shell::OpenURLFromTab(WebContents* source, 313 WebContents* Shell::OpenURLFromTab(WebContents* source,
314 const OpenURLParams& params) { 314 const OpenURLParams& params) {
315 // This implementation only handles CURRENT_TAB. 315 // This implementation only handles CURRENT_TAB.
316 if (params.disposition != CURRENT_TAB) 316 if (params.disposition != WindowOpenDisposition::CURRENT_TAB)
317 return nullptr; 317 return nullptr;
318 318
319 NavigationController::LoadURLParams load_url_params(params.url); 319 NavigationController::LoadURLParams load_url_params(params.url);
320 load_url_params.source_site_instance = params.source_site_instance; 320 load_url_params.source_site_instance = params.source_site_instance;
321 load_url_params.transition_type = params.transition; 321 load_url_params.transition_type = params.transition;
322 load_url_params.frame_tree_node_id = params.frame_tree_node_id; 322 load_url_params.frame_tree_node_id = params.frame_tree_node_id;
323 load_url_params.referrer = params.referrer; 323 load_url_params.referrer = params.referrer;
324 load_url_params.redirect_chain = params.redirect_chain; 324 load_url_params.redirect_chain = params.redirect_chain;
325 load_url_params.extra_headers = params.extra_headers; 325 load_url_params.extra_headers = params.extra_headers;
326 load_url_params.is_renderer_initiated = params.is_renderer_initiated; 326 load_url_params.is_renderer_initiated = params.is_renderer_initiated;
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 if (entry) 462 if (entry)
463 PlatformSetTitle(entry->GetTitle()); 463 PlatformSetTitle(entry->GetTitle());
464 } 464 }
465 465
466 void Shell::OnDevToolsWebContentsDestroyed() { 466 void Shell::OnDevToolsWebContentsDestroyed() {
467 devtools_observer_.reset(); 467 devtools_observer_.reset();
468 devtools_frontend_ = NULL; 468 devtools_frontend_ = NULL;
469 } 469 }
470 470
471 } // namespace content 471 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | extensions/browser/app_window/app_web_contents_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698