summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-14 00:16:46 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-14 00:16:46 +0000
commit1e546f16b18008f7839c4d6e53ecc106f1625302 (patch)
treee1b2c40e640645f461bdc13f620302f1f2e80c98 /chrome/browser
parentb0119722e29517d9ac0d055df6fc26afdad1be95 (diff)
downloadchromium_src-1e546f16b18008f7839c4d6e53ecc106f1625302.zip
chromium_src-1e546f16b18008f7839c4d6e53ecc106f1625302.tar.gz
chromium_src-1e546f16b18008f7839c4d6e53ecc106f1625302.tar.bz2
Reapplying "Extensions: tab.title should not be undefined."
I can no longer replicate the Vista unit test failures locally; I am assuming it was flake on the part of the tests. (If you request tab information while the page is loading, the tab.title is undefined and it shouldn't be.) Original Review URL: http://codereview.chromium.org/196125 BUG=22288 TEST=none Review URL: http://codereview.chromium.org/542065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36197 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/extensions/extension_tabs_module.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index aac6081..19d2687 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -115,10 +115,9 @@ DictionaryValue* ExtensionTabUtil::CreateTabValue(
result->SetString(keys::kStatusKey, GetTabStatusText(status));
result->SetBoolean(keys::kSelectedKey,
tab_strip && tab_index == tab_strip->selected_index());
+ result->SetString(keys::kTitleKey, UTF16ToWide(contents->GetTitle()));
if (status != TAB_LOADING) {
- result->SetString(keys::kTitleKey, UTF16ToWide(contents->GetTitle()));
-
NavigationEntry* entry = contents->controller().GetActiveEntry();
if (entry) {
if (entry->favicon().is_valid())