Bug 868342 - (Part 3) Check for null URL in BrowserToolbar.setTitle. r=wesj

This commit is contained in:
Margaret Leibovic 2013-05-14 16:19:35 -07:00
parent 868d702847
commit 8648a896c3

View File

@ -913,9 +913,10 @@ public class BrowserToolbar implements Tabs.OnTabsChangedListener,
title = null;
}
if (mShowUrl && title != null) {
title = StringUtils.stripScheme(tab.getURL());
title = StringUtils.stripCommonSubdomains(title.toString());
String url = tab.getURL();
if (mShowUrl && title != null && url != null) {
url = StringUtils.stripScheme(url);
title = StringUtils.stripCommonSubdomains(url);
// highlight the domain name if we find one
String baseDomain = tab.getBaseDomain();