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

Unified Diff: chrome/browser/ui/browser_navigator.cc

Issue 292713003: Session restore shouldn't care about profile home pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: disable 2 tests on mac (they fail after "fixed") Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/signin/signin_browsertest.cc ('k') | chrome/browser/ui/browser_tabrestore_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_navigator.cc
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index 24eaed8ce6e4d5bc908a9e36b118bfdfa538ff69..07c50d377abc3fdc50ed83a60d7467f217df0330 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -592,17 +592,9 @@ void Navigate(NavigateParams* params) {
// we are supposed to target a new tab; unless it's a singleton that already
// exists.
if (!params->target_contents && singleton_index < 0) {
- GURL url;
- if (params->url.is_empty()) {
- url = params->browser->profile()->GetHomePage();
- params->transition = content::PageTransitionFromInt(
- params->transition | content::PAGE_TRANSITION_HOME_PAGE);
- } else {
- url = params->url;
- }
-
+ DCHECK(!params->url.is_empty());
if (params->disposition != CURRENT_TAB) {
- params->target_contents = CreateTargetContents(*params, url);
+ params->target_contents = CreateTargetContents(*params, params->url);
// This function takes ownership of |params->target_contents| until it
// is added to a TabStripModel.
@@ -620,7 +612,7 @@ void Navigate(NavigateParams* params) {
// sessionStorage namespace could not match, so prerender will use the
// asynchronous codepath and still swap.
DCHECK(params->target_contents);
- swapped_in_prerender = SwapInPrerender(url, params);
+ swapped_in_prerender = SwapInPrerender(params->url, params);
if (user_initiated)
params->target_contents->UserGestureDone();
@@ -628,11 +620,11 @@ void Navigate(NavigateParams* params) {
if (!swapped_in_prerender) {
// Try to handle non-navigational URLs that popup dialogs and such, these
// should not actually navigate.
- if (!HandleNonNavigationAboutURL(url)) {
+ if (!HandleNonNavigationAboutURL(params->url)) {
// Perform the actual navigation, tracking whether it came from the
// renderer.
- LoadURLInContents(params->target_contents, url, params);
+ LoadURLInContents(params->target_contents, params->url, params);
// For prerender bookkeeping purposes, record that this pending navigate
// originated from chrome::Navigate.
content::NavigationEntry* entry =
« no previous file with comments | « chrome/browser/signin/signin_browsertest.cc ('k') | chrome/browser/ui/browser_tabrestore_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698