Move download shelf from per-tab to per-window

chrome/browser/views/tabs/tab_renderer.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/tabs/tab_renderer.h"
 
 #include <limits>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
@@ skipping 47 matching lines @@
 static SkBitmap* close_button_p = NULL;
 static int close_button_height = 0;
 static int close_button_width = 0;
 
 static SkBitmap* waiting_animation_frames = NULL;
 static SkBitmap* loading_animation_frames = NULL;
 static SkBitmap* crashed_fav_icon = NULL;
 static int loading_animation_frame_count = 0;
 static int waiting_animation_frame_count = 0;
 static int waiting_to_loading_frame_count_ratio = 0;
-static SkBitmap* download_icon = NULL;
-static int download_icon_width = 0;
-static int download_icon_height = 0;
 
 TabRenderer::TabImage TabRenderer::tab_alpha = {0};
 TabRenderer::TabImage TabRenderer::tab_active = {0};
 TabRenderer::TabImage TabRenderer::tab_inactive = {0};
 
 namespace {
 
 void InitResources() {
   static bool initialized = false;
   if (!initialized) {
@@ skipping 50 matching lines @@
         waiting_animation_frame_count / loading_animation_frame_count;
     // TODO(beng): eventually remove this when we have a proper themeing system.
     //             themes not supporting IDR_THROBBER_WAITING are causing this
     //             value to be 0 which causes DIV0 crashes. The value of 5
     //             matches the current bitmaps in our source.
     if (waiting_to_loading_frame_count_ratio == 0)
       waiting_to_loading_frame_count_ratio = 5;
 
     crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
 
-    download_icon = rb.GetBitmapNamed(IDR_DOWNLOAD_ICON);
-    download_icon_width = download_icon->width();
-    download_icon_height = download_icon->height();
-
     initialized = true;
   }
 }
 
 int GetContentHeight() {
   // The height of the content of the Tab is the largest of the favicon,
   // the title text and the close button graphic.
   int content_height = std::max(kFaviconSize, title_font_height);
   return std::max(content_height, close_button_height);
 }
@@ skipping 75 matching lines @@
   DISALLOW_EVIL_CONSTRUCTORS(FavIconCrashAnimation);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabRenderer, public:
 
 TabRenderer::TabRenderer()
     : animation_state_(ANIMATION_NONE),
       animation_frame_(0),
       showing_icon_(false),
-      showing_download_icon_(false),
       showing_close_button_(false),
       fav_icon_hiding_offset_(0),
       crash_animation_(NULL),
       should_display_crashed_favicon_(false),
       theme_provider_(NULL) {
   InitResources();
 
   // Add the Close Button.
   close_button_ = new TabCloseButton(this);
   close_button_->SetImage(views::CustomButton::BS_NORMAL, close_button_n);
@@ skipping 28 matching lines @@
   // return contents->profile()->GetThemeProvider();
   NOTREACHED() << "Unable to find a theme provider";
   return NULL;
 }
 
 void TabRenderer::UpdateData(TabContents* contents, bool loading_only) {
   DCHECK(contents);
   if (!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();
   }
 
   // TODO(glen): Temporary hax.
   theme_provider_ = contents->profile()->GetThemeProvider();
 
   // Loading state also involves whether we show the favicon, since that's where
   // we display the throbber.
   data_.loading = contents->is_loading();
@@ skipping 93 matching lines @@
 // TabRenderer, views::View overrides:
 
 void TabRenderer::Paint(gfx::Canvas* canvas) {
   // Don't paint if we're narrower than we can render correctly. (This should
   // only happen during animations).
   if (width() < GetMinimumUnselectedSize().width())
     return;
 
   // See if the model changes whether the icons should be painted.
   const bool show_icon = ShouldShowIcon();
-  const bool show_download_icon = data_.show_download_icon;
   const bool show_close_button = ShouldShowCloseBox();
   if (show_icon != showing_icon_ ||
-      show_download_icon != showing_download_icon_ ||
       show_close_button != showing_close_button_)
     Layout();
 
   PaintTabBackground(canvas);
 
   // Paint the loading animation if the page is currently loading, otherwise
   // show the page's favicon.
   if (show_icon) {
     if (animation_state_ != ANIMATION_NONE) {
       PaintLoadingAnimation(canvas);
@@ skipping 18 matching lines @@
                                 favicon_bounds_.x(),
                                 favicon_bounds_.y() + fav_icon_hiding_offset_,
                                 kFaviconSize, kFaviconSize,
                                 true);
         }
       }
       canvas->restore();
     }
   }
 
-  if (show_download_icon) {
-    canvas->DrawBitmapInt(*download_icon,
-                          download_icon_bounds_.x(), download_icon_bounds_.y());
-  }
-
   // Paint the Title.
   std::wstring title = data_.title;
   if (title.empty()) {
     if (data_.loading) {
       title = l10n_util::GetString(IDS_TAB_LOADING_TITLE);
     } else {
       title = l10n_util::GetString(IDS_TAB_UNTITLED_TITLE);
     }
   } else {
     Browser::FormatTitleForDisplay(&title);
@@ skipping 20 matching lines @@
 
   // Size the Favicon.
   showing_icon_ = ShouldShowIcon();
   if (showing_icon_) {
     int favicon_top = kTopPadding + (content_height - kFaviconSize) / 2;
     favicon_bounds_.SetRect(lb.x(), favicon_top, kFaviconSize, kFaviconSize);
   } else {
     favicon_bounds_.SetRect(lb.x(), lb.y(), 0, 0);
   }
 
-  // Size the download icon.
-  showing_download_icon_ = data_.show_download_icon;
-  if (showing_download_icon_) {
-    int icon_top = kTopPadding + (content_height - download_icon_height) / 2;
-    download_icon_bounds_.SetRect(lb.width() - download_icon_width, icon_top,
-                                  download_icon_width, download_icon_height);
-  }
-
   // Size the Close button.
   showing_close_button_ = ShouldShowCloseBox();
   if (showing_close_button_) {
     int close_button_top =
         kTopPadding + kCloseButtonVertFuzz +
         (content_height - close_button_height) / 2;
     // If the ratio of the close button size to tab width exceeds the maximum.
     close_button_->SetBounds(lb.width() + kCloseButtonHorzFuzz,
                              close_button_top, close_button_width,
                              close_button_height);
@@ skipping 15 matching lines @@
   if (text_height > minimum_size.height())
     title_top -= (text_height - minimum_size.height()) / 2;
 
   int title_width;
   if (close_button_->IsVisible()) {
     title_width = std::max(close_button_->x() -
                            kTitleCloseButtonSpacing - title_left, 0);
   } else {
     title_width = std::max(lb.width() - title_left, 0);
   }
-  if (data_.show_download_icon)
-    title_width = std::max(title_width - download_icon_width, 0);
   title_bounds_.SetRect(title_left, title_top, title_width, title_font_height);
 
-  // Certain UI elements within the Tab (the favicon, the download icon, etc.)
-  // are not represented as child Views (which is the preferred method).
-  // Instead, these UI elements are drawn directly on the canvas from within
-  // Tab::Paint(). The Tab's child Views (for example, the Tab's close button
-  // which is a views::Button instance) are automatically mirrored by the
-  // mirroring infrastructure in views. The elements Tab draws directly
-  // on the canvas need to be manually mirrored if the View's layout is
-  // right-to-left.
+  // Certain UI elements within the Tab (the favicon, etc.) are not represented
+  // as child Views (which is the preferred method).  Instead, these UI elements
+  // are drawn directly on the canvas from within Tab::Paint(). The Tab's child
+  // Views (for example, the Tab's close button which is a views::Button
+  // instance) are automatically mirrored by the mirroring infrastructure in
+  // views. The elements Tab draws directly on the canvas need to be manually
+  // mirrored if the View's layout is right-to-left.
   favicon_bounds_.set_x(MirroredLeftPointForRect(favicon_bounds_));
   title_bounds_.set_x(MirroredLeftPointForRect(title_bounds_));
-  download_icon_bounds_.set_x(MirroredLeftPointForRect(download_icon_bounds_));
 }
 
 void TabRenderer::OnMouseEntered(const views::MouseEvent& e) {
   hover_animation_->SetTweenType(SlideAnimation::EASE_OUT);
   hover_animation_->Show();
 }
 
 void TabRenderer::OnMouseExited(const views::MouseEvent& e) {
   hover_animation_->SetTweenType(SlideAnimation::EASE_IN);
   hover_animation_->Hide();
@@ skipping 260 matching lines @@
   tab_inactive.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT);
   tab_inactive.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER);
   tab_inactive.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT);
 
   tab_inactive.l_width = tab_inactive.image_l->width();
   tab_inactive.r_width = tab_inactive.image_r->width();
 
   loading_animation_frames = rb.GetBitmapNamed(IDR_THROBBER);
   waiting_animation_frames = rb.GetBitmapNamed(IDR_THROBBER_WAITING);
 }