diff options
40 files changed, 7 insertions, 4 deletions
diff --git a/chrome/app/theme/download_button_center_bottom.png b/chrome/app/theme/download_button_center_bottom.png Binary files differindex e927272..98b33ac 100644 --- a/chrome/app/theme/download_button_center_bottom.png +++ b/chrome/app/theme/download_button_center_bottom.png diff --git a/chrome/app/theme/download_button_center_bottom_h.png b/chrome/app/theme/download_button_center_bottom_h.png Binary files differindex dab6ebd..fbb438d 100644 --- a/chrome/app/theme/download_button_center_bottom_h.png +++ b/chrome/app/theme/download_button_center_bottom_h.png diff --git a/chrome/app/theme/download_button_center_bottom_p.png b/chrome/app/theme/download_button_center_bottom_p.png Binary files differindex 792d103..5aec7e4 100644 --- a/chrome/app/theme/download_button_center_bottom_p.png +++ b/chrome/app/theme/download_button_center_bottom_p.png diff --git a/chrome/app/theme/download_button_center_middle.png b/chrome/app/theme/download_button_center_middle.png Binary files differindex f9d72aa..61c8e1d 100644 --- a/chrome/app/theme/download_button_center_middle.png +++ b/chrome/app/theme/download_button_center_middle.png diff --git a/chrome/app/theme/download_button_center_middle_h.png b/chrome/app/theme/download_button_center_middle_h.png Binary files differindex dc872dd..752c9bc 100644 --- a/chrome/app/theme/download_button_center_middle_h.png +++ b/chrome/app/theme/download_button_center_middle_h.png diff --git a/chrome/app/theme/download_button_center_middle_p.png b/chrome/app/theme/download_button_center_middle_p.png Binary files differindex f9d72aa..3e0f9bd 100644 --- a/chrome/app/theme/download_button_center_middle_p.png +++ b/chrome/app/theme/download_button_center_middle_p.png diff --git a/chrome/app/theme/download_button_center_top.png b/chrome/app/theme/download_button_center_top.png Binary files differindex d6686a4..c42d5e5 100644 --- a/chrome/app/theme/download_button_center_top.png +++ b/chrome/app/theme/download_button_center_top.png diff --git a/chrome/app/theme/download_button_center_top_h.png b/chrome/app/theme/download_button_center_top_h.png Binary files differindex b556052..011e84b 100644 --- a/chrome/app/theme/download_button_center_top_h.png +++ b/chrome/app/theme/download_button_center_top_h.png diff --git a/chrome/app/theme/download_button_center_top_p.png b/chrome/app/theme/download_button_center_top_p.png Binary files differindex a513665..02f1bd4 100644 --- a/chrome/app/theme/download_button_center_top_p.png +++ b/chrome/app/theme/download_button_center_top_p.png diff --git a/chrome/app/theme/download_button_left_bottom.png b/chrome/app/theme/download_button_left_bottom.png Binary files differindex 90fe6f4..6606ec5 100644 --- a/chrome/app/theme/download_button_left_bottom.png +++ b/chrome/app/theme/download_button_left_bottom.png diff --git a/chrome/app/theme/download_button_left_bottom_h.png b/chrome/app/theme/download_button_left_bottom_h.png Binary files differindex 2a39214..97af1f7 100644 --- a/chrome/app/theme/download_button_left_bottom_h.png +++ b/chrome/app/theme/download_button_left_bottom_h.png diff --git a/chrome/app/theme/download_button_left_bottom_p.png b/chrome/app/theme/download_button_left_bottom_p.png Binary files differindex 59046e2..feed5bb 100644 --- a/chrome/app/theme/download_button_left_bottom_p.png +++ b/chrome/app/theme/download_button_left_bottom_p.png diff --git a/chrome/app/theme/download_button_left_middle.png b/chrome/app/theme/download_button_left_middle.png Binary files differindex 877842a..2dbe452 100644 --- a/chrome/app/theme/download_button_left_middle.png +++ b/chrome/app/theme/download_button_left_middle.png diff --git a/chrome/app/theme/download_button_left_middle_h.png b/chrome/app/theme/download_button_left_middle_h.png Binary files differindex 056e691..e141981 100644 --- a/chrome/app/theme/download_button_left_middle_h.png +++ b/chrome/app/theme/download_button_left_middle_h.png diff --git a/chrome/app/theme/download_button_left_middle_p.png b/chrome/app/theme/download_button_left_middle_p.png Binary files differindex 68be397..f19b54b 100644 --- a/chrome/app/theme/download_button_left_middle_p.png +++ b/chrome/app/theme/download_button_left_middle_p.png diff --git a/chrome/app/theme/download_button_left_top.png b/chrome/app/theme/download_button_left_top.png Binary files differindex cd1464e..bf880da 100644 --- a/chrome/app/theme/download_button_left_top.png +++ b/chrome/app/theme/download_button_left_top.png diff --git a/chrome/app/theme/download_button_left_top_h.png b/chrome/app/theme/download_button_left_top_h.png Binary files differindex de955ae..8fff154 100644 --- a/chrome/app/theme/download_button_left_top_h.png +++ b/chrome/app/theme/download_button_left_top_h.png diff --git a/chrome/app/theme/download_button_left_top_p.png b/chrome/app/theme/download_button_left_top_p.png Binary files differindex 6749207..1c3d1e1 100644 --- a/chrome/app/theme/download_button_left_top_p.png +++ b/chrome/app/theme/download_button_left_top_p.png diff --git a/chrome/app/theme/download_button_menu_bottom.png b/chrome/app/theme/download_button_menu_bottom.png Binary files differindex 6a64c12..12a9f40 100644 --- a/chrome/app/theme/download_button_menu_bottom.png +++ b/chrome/app/theme/download_button_menu_bottom.png diff --git a/chrome/app/theme/download_button_menu_bottom_h.png b/chrome/app/theme/download_button_menu_bottom_h.png Binary files differindex cf5a68d..2857f50 100644 --- a/chrome/app/theme/download_button_menu_bottom_h.png +++ b/chrome/app/theme/download_button_menu_bottom_h.png diff --git a/chrome/app/theme/download_button_menu_bottom_p.png b/chrome/app/theme/download_button_menu_bottom_p.png Binary files differindex 5941bc7..d7dcbb7 100644 --- a/chrome/app/theme/download_button_menu_bottom_p.png +++ b/chrome/app/theme/download_button_menu_bottom_p.png diff --git a/chrome/app/theme/download_button_menu_middle.png b/chrome/app/theme/download_button_menu_middle.png Binary files differindex ed0920d..f652f9e 100644 --- a/chrome/app/theme/download_button_menu_middle.png +++ b/chrome/app/theme/download_button_menu_middle.png diff --git a/chrome/app/theme/download_button_menu_middle_h.png b/chrome/app/theme/download_button_menu_middle_h.png Binary files differindex 9070d29..83be232 100644 --- a/chrome/app/theme/download_button_menu_middle_h.png +++ b/chrome/app/theme/download_button_menu_middle_h.png diff --git a/chrome/app/theme/download_button_menu_middle_p.png b/chrome/app/theme/download_button_menu_middle_p.png Binary files differindex 8302352..069efef 100644 --- a/chrome/app/theme/download_button_menu_middle_p.png +++ b/chrome/app/theme/download_button_menu_middle_p.png diff --git a/chrome/app/theme/download_button_menu_top.png b/chrome/app/theme/download_button_menu_top.png Binary files differindex 2569b15..95166e3 100644 --- a/chrome/app/theme/download_button_menu_top.png +++ b/chrome/app/theme/download_button_menu_top.png diff --git a/chrome/app/theme/download_button_menu_top_h.png b/chrome/app/theme/download_button_menu_top_h.png Binary files differindex 061da6d..079b25e 100644 --- a/chrome/app/theme/download_button_menu_top_h.png +++ b/chrome/app/theme/download_button_menu_top_h.png diff --git a/chrome/app/theme/download_button_menu_top_p.png b/chrome/app/theme/download_button_menu_top_p.png Binary files differindex 770c445..07418f8 100644 --- a/chrome/app/theme/download_button_menu_top_p.png +++ b/chrome/app/theme/download_button_menu_top_p.png diff --git a/chrome/app/theme/download_button_right_bottom.png b/chrome/app/theme/download_button_right_bottom.png Binary files differindex 92ce88b..8b63cb9 100644 --- a/chrome/app/theme/download_button_right_bottom.png +++ b/chrome/app/theme/download_button_right_bottom.png diff --git a/chrome/app/theme/download_button_right_bottom_h.png b/chrome/app/theme/download_button_right_bottom_h.png Binary files differindex 0e59f8d..0adcdbd 100644 --- a/chrome/app/theme/download_button_right_bottom_h.png +++ b/chrome/app/theme/download_button_right_bottom_h.png diff --git a/chrome/app/theme/download_button_right_bottom_no_dd.png b/chrome/app/theme/download_button_right_bottom_no_dd.png Binary files differindex 4c9d3db..d54a941 100644 --- a/chrome/app/theme/download_button_right_bottom_no_dd.png +++ b/chrome/app/theme/download_button_right_bottom_no_dd.png diff --git a/chrome/app/theme/download_button_right_bottom_p.png b/chrome/app/theme/download_button_right_bottom_p.png Binary files differindex ddfc3f1..784bf8a 100644 --- a/chrome/app/theme/download_button_right_bottom_p.png +++ b/chrome/app/theme/download_button_right_bottom_p.png diff --git a/chrome/app/theme/download_button_right_middle.png b/chrome/app/theme/download_button_right_middle.png Binary files differindex a513303..a0bda71 100644 --- a/chrome/app/theme/download_button_right_middle.png +++ b/chrome/app/theme/download_button_right_middle.png diff --git a/chrome/app/theme/download_button_right_middle_h.png b/chrome/app/theme/download_button_right_middle_h.png Binary files differindex 3a9616e..e539c22 100644 --- a/chrome/app/theme/download_button_right_middle_h.png +++ b/chrome/app/theme/download_button_right_middle_h.png diff --git a/chrome/app/theme/download_button_right_middle_no_dd.png b/chrome/app/theme/download_button_right_middle_no_dd.png Binary files differindex df2cf9e..82d6e14 100644 --- a/chrome/app/theme/download_button_right_middle_no_dd.png +++ b/chrome/app/theme/download_button_right_middle_no_dd.png diff --git a/chrome/app/theme/download_button_right_middle_p.png b/chrome/app/theme/download_button_right_middle_p.png Binary files differindex 95e38b8..1ce21c1 100644 --- a/chrome/app/theme/download_button_right_middle_p.png +++ b/chrome/app/theme/download_button_right_middle_p.png diff --git a/chrome/app/theme/download_button_right_top.png b/chrome/app/theme/download_button_right_top.png Binary files differindex 3de006e..14b60bb 100644 --- a/chrome/app/theme/download_button_right_top.png +++ b/chrome/app/theme/download_button_right_top.png diff --git a/chrome/app/theme/download_button_right_top_h.png b/chrome/app/theme/download_button_right_top_h.png Binary files differindex 738c15f..fdf40f7 100644 --- a/chrome/app/theme/download_button_right_top_h.png +++ b/chrome/app/theme/download_button_right_top_h.png diff --git a/chrome/app/theme/download_button_right_top_no_dd.png b/chrome/app/theme/download_button_right_top_no_dd.png Binary files differindex f57fd85..e43011c 100644 --- a/chrome/app/theme/download_button_right_top_no_dd.png +++ b/chrome/app/theme/download_button_right_top_no_dd.png diff --git a/chrome/app/theme/download_button_right_top_p.png b/chrome/app/theme/download_button_right_top_p.png Binary files differindex 3f44934..2ef3c16 100644 --- a/chrome/app/theme/download_button_right_top_p.png +++ b/chrome/app/theme/download_button_right_top_p.png diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc index ba87039..fcf01df 100644 --- a/chrome/browser/views/download_shelf_view.cc +++ b/chrome/browser/views/download_shelf_view.cc @@ -10,6 +10,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" +#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/tab_contents/navigation_entry.h" @@ -43,9 +44,6 @@ static const int kTopBottomPadding = 2; // Padding between the icon and 'show all downloads' link static const int kDownloadsTitlePadding = 4; -// Default background color for the shelf. -static const SkColor kBackgroundColor = SkColorSetRGB(230, 237, 244); - // Border color. static const SkColor kBorderColor = SkColorSetRGB(214, 214, 214); @@ -101,7 +99,6 @@ void DownloadShelfView::Init() { close_button_->SetImage(views::CustomButton::BS_PUSHED, rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); AddChildView(close_button_); - set_background(views::Background::CreateSolidBackground(kBackgroundColor)); new_item_animation_.reset(new SlideAnimation(this)); new_item_animation_->SetSlideDuration(kNewItemAnimationDurationMs); @@ -205,6 +202,12 @@ void DownloadShelfView::Layout() { if (!GetWidget()) return; + // Now that we know we have a parent, we can safely set our theme colors. + show_all_view_->SetColor( + GetThemeProvider()->GetColor(BrowserThemeProvider::COLOR_BOOKMARK_TEXT)); + set_background(views::Background::CreateSolidBackground( + GetThemeProvider()->GetColor(BrowserThemeProvider::COLOR_TOOLBAR))); + // Let our base class layout our child views views::View::Layout(); |
