diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-04 23:26:47 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-04 23:26:47 +0000 |
commit | b6ea741a64dc5cddcfe735d15e68718b0f377363 (patch) | |
tree | 812a7b0874583f68fe7a2c6c07f0bc8eaa0ab027 /chrome/browser/jumplist.cc | |
parent | 274a2a86145f82814f0a0652a2c255469e256d06 (diff) | |
download | chromium_src-b6ea741a64dc5cddcfe735d15e68718b0f377363.zip chromium_src-b6ea741a64dc5cddcfe735d15e68718b0f377363.tar.gz chromium_src-b6ea741a64dc5cddcfe735d15e68718b0f377363.tar.bz2 |
Lands http://codereview.chromium.org/1744011/show for Hans:
Make reopened tabs with "about:" URLs display properly.
- Rename TabNavigation::url_ to virtual_url_.
Make it more explicit that a TabNavigation stores the *virtual* URL of
a
NavigationEntry.
- Translate virtual URLs when restoring tabs.
Instead of putting the virtual URL in the URL proper field when
creating a
NavigationEntry from a TabNavigation, put it in the virtual URL field,
and
then translate this to a proper URL in
NavigationController::CreateNavigationEntriesFromTabNavigations().
This fixes bug 31905.
Contributed by Hans Wennborg <hans@chromium.org>
BUG=31905
TEST=ui_tests --gtest_filter=TabRestoreUITest.RestoreTabWithSpecialURL*
Review URL: http://codereview.chromium.org/1946002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46406 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/jumplist.cc')
-rw-r--r-- | chrome/browser/jumplist.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/jumplist.cc b/chrome/browser/jumplist.cc index 41b257c..bb9e506 100644 --- a/chrome/browser/jumplist.cc +++ b/chrome/browser/jumplist.cc @@ -644,11 +644,11 @@ bool JumpList::AddTab(const TabRestoreService::Tab* tab, const TabNavigation& current_navigation = tab->navigations.at(tab->current_navigation_index); - if (current_navigation.url() == GURL(chrome::kChromeUINewTabURL)) + if (current_navigation.virtual_url() == GURL(chrome::kChromeUINewTabURL)) return false; scoped_refptr<ShellLinkItem> link(new ShellLinkItem); - std::string url = current_navigation.url().spec(); + std::string url = current_navigation.virtual_url().spec(); link->SetArguments(UTF8ToWide(url)); link->SetTitle(current_navigation.title()); list->push_back(link); |