summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_tabs_module.cc
diff options
context:
space:
mode:
authorbeaudoin@chromium.org <beaudoin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-21 14:43:51 +0000
committerbeaudoin@chromium.org <beaudoin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-21 14:43:51 +0000
commitf5d978cfcc87e29ac3284d9c518770d24c529699 (patch)
treef10f4a851d5a86499792ba525522456ce2da1b42 /chrome/browser/extensions/extension_tabs_module.cc
parent4f27ff905f70604752d3365d813405a5122282de (diff)
downloadchromium_src-f5d978cfcc87e29ac3284d9c518770d24c529699.zip
chromium_src-f5d978cfcc87e29ac3284d9c518770d24c529699.tar.gz
chromium_src-f5d978cfcc87e29ac3284d9c518770d24c529699.tar.bz2
Ensures history tab displays a throbber when searching.
When performing a long running search in the history, turn on the tab thobber to indicate that an operation is in progress. BUG=14730 TEST=Ensure you have a large browsing history, go to chrome://history, search for something, notice the throbber come on. Review URL: http://codereview.chromium.org/7399007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93392 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tabs_module.cc')
-rw-r--r--chrome/browser/extensions/extension_tabs_module.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index e1f0361..c546adf 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -187,12 +187,13 @@ DictionaryValue* ExtensionTabUtil::CreateTabValue(const TabContents* contents,
TabStripModel* tab_strip,
int tab_index) {
DictionaryValue* result = new DictionaryValue();
+ bool is_loading = contents->IsLoading();
result->SetInteger(keys::kIdKey, ExtensionTabUtil::GetTabId(contents));
result->SetInteger(keys::kIndexKey, tab_index);
result->SetInteger(keys::kWindowIdKey,
ExtensionTabUtil::GetWindowIdOfTab(contents));
result->SetString(keys::kUrlKey, contents->GetURL().spec());
- result->SetString(keys::kStatusKey, GetTabStatusText(contents->is_loading()));
+ result->SetString(keys::kStatusKey, GetTabStatusText(is_loading));
result->SetBoolean(keys::kSelectedKey,
tab_strip && tab_index == tab_strip->active_index());
result->SetBoolean(keys::kPinnedKey,
@@ -201,7 +202,7 @@ DictionaryValue* ExtensionTabUtil::CreateTabValue(const TabContents* contents,
result->SetBoolean(keys::kIncognitoKey,
contents->profile()->IsOffTheRecord());
- if (!contents->is_loading()) {
+ if (!is_loading) {
NavigationEntry* entry = contents->controller().GetActiveEntry();
if (entry) {
if (entry->favicon().is_valid())