summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-28 19:20:52 +0000
committerkuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-28 19:20:52 +0000
commit11924815ef76d03622580daa4a1ec7f61d39db58 (patch)
tree8f12eac20cd6dd91f5d06d6a62bc091e5dfe1b60
parent2ccec47658e2208cd443935876e30fb90098c93c (diff)
downloadchromium_src-11924815ef76d03622580daa4a1ec7f61d39db58.zip
chromium_src-11924815ef76d03622580daa4a1ec7f61d39db58.tar.gz
chromium_src-11924815ef76d03622580daa4a1ec7f61d39db58.tar.bz2
alternate ntp: fix missing tab title in "Recent tabs" menu
- tab title was empty, so use url now if so BUG=163051 TEST=verify per bug rpt (create client to sync w/ tabs without titles) Review URL: https://chromiumcodereview.appspot.com/11411221 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170016 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
index 4aa235f..bf982d0 100644
--- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
+++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
@@ -340,7 +340,10 @@ void RecentTabsSubMenuModel::BuildForeignTabItem(
NavigationItem item(session_tag, tab.tab_id.id(),
current_navigation.virtual_url());
int command_id = ModelIndexToCommandId(model_.size());
- AddItem(command_id, current_navigation.title());
+ // There may be no tab title, in which case, use the url as tab title.
+ AddItem(command_id,
+ current_navigation.title().empty() ?
+ UTF8ToUTF16(item.url.spec()) : current_navigation.title());
AddTabFavicon(model_.size(), command_id, item.url);
model_.push_back(item);
}