From afb738834f1e43f4607f1d5d00bae23aa740dbaa Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Fri, 14 Nov 2008 22:40:44 +0000 Subject: 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 --- chrome/browser/tabs/tab_strip_model.cc | 5 ----- chrome/browser/tabs/tab_strip_model.h | 16 ---------------- chrome/browser/tabs/tab_strip_model_unittest.cc | 1 - 3 files changed, 22 deletions(-) (limited to 'chrome/browser/tabs') diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc index ac5b2dc..9c29452 100644 --- a/chrome/browser/tabs/tab_strip_model.cc +++ b/chrome/browser/tabs/tab_strip_model.cc @@ -217,11 +217,6 @@ void TabStripModel::UpdateTabContentsStateAt(int index) { TabChangedAt(GetContentsAt(index), index)); } -void TabStripModel::UpdateTabContentsLoadingAnimations() { - FOR_EACH_OBSERVER(TabStripModelObserver, observers_, - TabValidateAnimations()); -} - void TabStripModel::CloseAllTabs() { // Set state so that observers can adjust their behavior to suit this // specific condition when CloseTabContentsAt causes a flurry of diff --git a/chrome/browser/tabs/tab_strip_model.h b/chrome/browser/tabs/tab_strip_model.h index ebdec91..386599c 100644 --- a/chrome/browser/tabs/tab_strip_model.h +++ b/chrome/browser/tabs/tab_strip_model.h @@ -69,12 +69,6 @@ class TabStripModelObserver { int to_index) { } // The specified TabContents at |index| changed in some way. virtual void TabChangedAt(TabContents* contents, int index) { } - // Loading progress representations for tabs should be validated/updated. - // TODO(beng): this wiring is cracktarded. consider revising. The loading - // animation timer should live in BrowserView2, and from there - // notify both the tabstrip and the window icon. - // clean this up once XPFrame and VistaFrame have retired. - virtual void TabValidateAnimations() { } // The TabStripModel now no longer has any "significant" (user created or // user manipulated) tabs. The implementer may use this as a trigger to try // and close the window containing the TabStripModel, for example... @@ -131,11 +125,6 @@ class TabStripModelDelegate { // window. virtual void DuplicateContentsAt(int index) = 0; - // Called every time the the throbber needs to be updated. We have this to - // give the browser/frame a chance to implement some loading animation. This - // is used by simple web application frames. - virtual void ValidateLoadingAnimations() = 0; - // Called when a drag session has completed and the frame that initiated the // the session should be closed. virtual void CloseFrameAfterDragSession() = 0; @@ -280,11 +269,6 @@ class TabStripModel : public NotificationObserver { // changed in some way. void UpdateTabContentsStateAt(int index); - // Notify any observers that Loading progress for TabContents should be - // validated. - // TODO(beng): (Cleanup) This should definitely be moved to the View. - void UpdateTabContentsLoadingAnimations(); - // Make sure there is an auto-generated New Tab tab in the TabStripModel. // If |force_create| is true, the New Tab will be created even if the // preference is set to false (used by startup). diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc index 3b8ea61..24c9b3c 100644 --- a/chrome/browser/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/tabs/tab_strip_model_unittest.cc @@ -1009,7 +1009,6 @@ class TabStripDummyDelegate : public TabStripModelDelegate { } virtual bool CanDuplicateContentsAt(int index) { return false; } virtual void DuplicateContentsAt(int index) {} - virtual void ValidateLoadingAnimations() {} virtual void CloseFrameAfterDragSession() {} private: -- cgit v1.1