diff options
| author | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 05:58:17 +0000 |
|---|---|---|
| committer | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 05:58:17 +0000 |
| commit | 2baf83d75ea5d1233d3ddcf8e28aa4f4466c115c (patch) | |
| tree | 617cf49b21490c8e7b2e3c5a821c5d72c5735894 /chrome/browser/browser_commands.cc | |
| parent | 492399e06e64635ca8e3191f0653a8b081863b33 (diff) | |
| download | chromium_src-2baf83d75ea5d1233d3ddcf8e28aa4f4466c115c.zip chromium_src-2baf83d75ea5d1233d3ddcf8e28aa4f4466c115c.tar.gz chromium_src-2baf83d75ea5d1233d3ddcf8e28aa4f4466c115c.tar.bz2 | |
Fix 1295677: REGRESSION: Import SETS startup page to imported home page.
We had only kHomePage pref before, which if blank/set to chrome-internal: meant that the New Tab page should be shown when Home is pressed. Now we add a pref called kHomePageIsNewTabPage for this purpose, which allows us to set the kHomePage value during import without actually using it as the HomePage (effectively importing home page becomes importing a default suggestion for when the users want a home page instead of the New Tab page).
BUG=1295677
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_commands.cc')
| -rw-r--r-- | chrome/browser/browser_commands.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/browser_commands.cc b/chrome/browser/browser_commands.cc index 686016d..974a4f3 100644 --- a/chrome/browser/browser_commands.cc +++ b/chrome/browser/browser_commands.cc @@ -847,12 +847,7 @@ void Browser::Reload() { } void Browser::Home() { - GURL homepage_url(URLFixerUpper::FixupURL( - profile_->GetPrefs()->GetString(prefs::kHomePage), - std::wstring())); - if (!homepage_url.is_valid()) - homepage_url = NewTabUIURL(); - + GURL homepage_url = GetHomePage(); GetSelectedTabContents()->controller()->LoadURL( homepage_url, PageTransition::AUTO_BOOKMARK); } |