Merge two TabContents::InvalidateTypes types and properly update tab download icon.

INVALIDATE_FAVICON and INVALIDATE_TITLE become INVALIDATE_TAB. Also removed some dead code.

TEST=starting a download in a tab should show the download icon. Closing the dshelf should make the icon disappear.

Review URL: http://codereview.chromium.org/109050

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15387 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 1 insertions, 13 deletions

diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index cdcd078..11ab3b5 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -683,11 +683,6 @@ void ConstrainedWindowImpl::InitAsDialog(const gfx::Rect& initial_bounds) {
   ActivateConstrainedWindow();
 }
 
-void ConstrainedWindowImpl::UpdateUI(unsigned int changed_flags) {
-  if (changed_flags & TabContents::INVALIDATE_TITLE)
-    UpdateWindowTitle();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindowImpl, views::WidgetWin overrides:
 
diff --git a/chrome/browser/views/constrained_window_impl.h b/chrome/browser/views/constrained_window_impl.h
index 4afec31..a4ff2bd 100644
--- a/chrome/browser/views/constrained_window_impl.h
+++ b/chrome/browser/views/constrained_window_impl.h
@@ -64,9 +64,6 @@ class ConstrainedWindowImpl : public ConstrainedWindow,
   // views::View client area.
   void InitAsDialog(const gfx::Rect& initial_bounds);
 
-  // Updates the portions of the UI as specified in |changed_flags|.
-  void UpdateUI(unsigned int changed_flags);
-
   // The TabContents that owns and constrains this ConstrainedWindow.
   TabContents* owner_;
 
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index 285ebcc..ca69bdd 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -242,6 +242,7 @@ void TabRenderer::UpdateData(TabContents* contents, bool loading_only) {
     data_.title = UTF16ToWideHack(contents->GetTitle());
     data_.off_the_record = contents->profile()->IsOffTheRecord();
     data_.show_download_icon = contents->IsDownloadShelfVisible();
+    data_.crashed = contents->is_crashed();
     data_.favicon = contents->GetFavIcon();
   }
 
@@ -249,11 +250,6 @@ void TabRenderer::UpdateData(TabContents* contents, bool loading_only) {
   // we display the throbber.
   data_.loading = contents->is_loading();
   data_.show_icon = contents->ShouldDisplayFavIcon();
-
-  // Because the crashed notification comes through the tab contents, it
-  // appears as a loading_only change. This is fine, since the crashed flag is
-  // trivial to update unlike the title and favicon.
-  data_.crashed = contents->is_crashed();
 }
 
 void TabRenderer::UpdateFromModel() {