diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 22:40:44 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 22:40:44 +0000 |
commit | afb738834f1e43f4607f1d5d00bae23aa740dbaa (patch) | |
tree | d12bcf05a51aeb5369b72c1ee838e984a7b9d76f /chrome/browser/browser.cc | |
parent | 5a068bd029b1d28374f0cf26cbb74bc1ef33bd0c (diff) | |
download | chromium_src-afb738834f1e43f4607f1d5d00bae23aa740dbaa.zip chromium_src-afb738834f1e43f4607f1d5d00bae23aa740dbaa.tar.gz chromium_src-afb738834f1e43f4607f1d5d00bae23aa740dbaa.tar.bz2 |
Rewire the throbber so that the timer for updating lives on BrowserView, not TabStrip, so that app window/popup throbber updating doesn't need to be plumbed through the tabstrip and the browser object!
http://crbug.com/3297
Review URL: http://codereview.chromium.org/10761
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r-- | chrome/browser/browser.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 2b2a381..19ecce9 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -394,6 +394,10 @@ std::wstring Browser::GetCurrentPageTitle() const { return l10n_util::GetStringF(IDS_BROWSER_WINDOW_TITLE_FORMAT, title); } +bool Browser::IsCurrentPageLoading() const { + return GetSelectedTabContents()->is_loading(); +} + // static void Browser::FormatTitleForDisplay(std::wstring* title) { size_t current_index = 0; @@ -1333,12 +1337,6 @@ void Browser::DuplicateContentsAt(int index) { } } -void Browser::ValidateLoadingAnimations() { - // TODO(beng): Remove this, per http://crbug.com/3297 - if (window_) - window_->ValidateThrobber(); -} - void Browser::CloseFrameAfterDragSession() { // This is scheduled to run after we return to the message loop because // otherwise the frame will think the drag session is still active and ignore @@ -1684,8 +1682,7 @@ void Browser::ActivateContents(TabContents* contents) { } void Browser::LoadingStateChanged(TabContents* source) { - tabstrip_model_.UpdateTabContentsLoadingAnimations(); - + window_->UpdateLoadingAnimations(tabstrip_model_.TabsAreLoading()); window_->UpdateTitleBar(); // Let the go button know that it should change appearance if possible. |