Merge 22980 - Mask the close button on the download shelf so that it's visibl...

chrome/browser/views/download_shelf_view.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/download_shelf_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
@@ skipping 54 matching lines @@
   size->set_height(std::max(view_preferred.height(), size->height()));
 }
 
 int CenterPosition(int size, int target_size) {
   return std::max((target_size - size) / 2, kTopBottomPadding);
 }
 
 }  // namespace
 
 DownloadShelfView::DownloadShelfView(Browser* browser, BrowserView* parent)
-    : browser_(browser), parent_(parent) {
+    : browser_(browser),
+      parent_(parent) {
   parent->AddChildView(this);
   Init();
 }
 
 DownloadShelfView::~DownloadShelfView() {
   parent_->RemoveChildView(this);
 }
 
 void DownloadShelfView::Init() {
   ResourceBundle &rb = ResourceBundle::GetSharedInstance();
   arrow_image_ = new views::ImageView();
   arrow_image_->SetImage(rb.GetBitmapNamed(IDR_DOWNLOADS_FAVICON));
   AddChildView(arrow_image_);
 
   show_all_view_ =
       new views::Link(l10n_util::GetString(IDS_SHOW_ALL_DOWNLOADS));
   show_all_view_->SetController(this);
   AddChildView(show_all_view_);
 
   close_button_ = new views::ImageButton(this);
   close_button_->SetImage(views::CustomButton::BS_NORMAL,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR));
   close_button_->SetImage(views::CustomButton::BS_HOT,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR_H));
   close_button_->SetImage(views::CustomButton::BS_PUSHED,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR_P));
+  UpdateButtonColors();
   AddChildView(close_button_);
 
   new_item_animation_.reset(new SlideAnimation(this));
   new_item_animation_->SetSlideDuration(kNewItemAnimationDurationMs);
 
   shelf_animation_.reset(new SlideAnimation(this));
   shelf_animation_->SetSlideDuration(kShelfAnimationDurationMs);
   Show();
 }
 
@@ skipping 165 matching lines @@
   int available_width = width() - kRightPadding - close_button_size.width() -
       kCloseAndLinkPadding - show_all_size.width() - kDownloadsTitlePadding -
       image_size.width() - kDownloadPadding - kLeftPadding;
   if (available_width <= 0)
     return false;
 
   gfx::Size item_size = (*download_views_.rbegin())->GetPreferredSize();
   return item_size.width() < available_width;
 }
 
+void DownloadShelfView::UpdateButtonColors() {
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  if (GetThemeProvider()) {
+    close_button_->SetBackground(
+        GetThemeProvider()->GetColor(BrowserThemeProvider::COLOR_TAB_TEXT),
+        rb.GetBitmapNamed(IDR_CLOSE_BAR),
+        rb.GetBitmapNamed(IDR_CLOSE_BAR_MASK));
+  }
+}
+
+void DownloadShelfView::ThemeChanged() {
+  UpdateButtonColors();
+}
+
 void DownloadShelfView::LinkActivated(views::Link* source, int event_flags) {
   browser_->ShowDownloadsTab();
 }
 
 void DownloadShelfView::ButtonPressed(views::Button* button) {
   Close();
 }
 
 bool DownloadShelfView::IsShowing() const {
   return shelf_animation_->IsShowing();
 }
 
 bool DownloadShelfView::IsClosing() const {
   return shelf_animation_->IsClosing();
 }
 
 void DownloadShelfView::Show() {
   shelf_animation_->Show();
 }
 
 void DownloadShelfView::Close() {
   parent_->SetDownloadShelfVisible(false);
   shelf_animation_->Hide();
 }