Reverting 19758.

chrome/browser/views/tabs/tab_strip.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_strip.h"
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #if defined(OS_WIN)
 #include "app/win_util.h"
 #endif
 #include "base/gfx/size.h"
 #include "base/stl_util-inl.h"
-#include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/tabs/dragged_tab_controller.h"
 #include "chrome/browser/views/tabs/tab.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
@@ skipping 559 matching lines @@
     }
   }
 }
 
 void TabStrip::SetBackgroundOffset(gfx::Point offset) {
   int tab_count = GetTabCount();
   for (int i = 0; i < tab_count; ++i)
     GetTabAt(i)->SetBackgroundOffset(offset);
 }
 
-void TabStrip::InitTabStripButtons() {
-  newtab_button_ = new NewTabButton(this);
-  LoadNewTabButtonImage();
-  newtab_button_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_NEWTAB));
-  AddChildView(newtab_button_);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // TabStrip, views::View overrides:
 
 void TabStrip::PaintChildren(gfx::Canvas* canvas) {
   // Paint the tabs in reverse order, so they stack to the left.
   Tab* selected_tab = NULL;
   for (int i = GetTabCount() - 1; i >= 0; --i) {
     Tab* tab = GetTabAt(i);
     // We must ask the _Tab's_ model, not ourselves, because in some situations
     // the model will be different to this object, e.g. when a Tab is being
@@ skipping 153 matching lines @@
       return next_tab;
     Tab* tab = GetTabAt(i);
     if (IsPointInTab(tab, point))
       return tab;
   }
 
   // No need to do any floating view stuff, we don't use them in the TabStrip.
   return this;
 }
 
-void TabStrip::ThemeChanged() {
-  LoadNewTabButtonImage();
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // TabStrip, TabStripModelObserver implementation:
 
 void TabStrip::TabInsertedAt(TabContents* contents,
                              int index,
                              bool foreground) {
   DCHECK(contents);
   DCHECK(index == TabStripModel::kNoTab || model_->ContainsIndex(index));
 
   if (active_animation_.get())
@@ skipping 287 matching lines @@
       break;
   }
 }
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStrip, private:
 
 void TabStrip::Init() {
   model_->AddObserver(this);
+  newtab_button_ = new NewTabButton(this);
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  SkBitmap* bitmap;
+
+  bitmap = rb.GetBitmapNamed(IDR_NEWTAB_BUTTON);
+  newtab_button_->SetImage(views::CustomButton::BS_NORMAL, bitmap);
+  newtab_button_->SetImage(views::CustomButton::BS_PUSHED,
+                           rb.GetBitmapNamed(IDR_NEWTAB_BUTTON_P));
+  newtab_button_->SetImage(views::CustomButton::BS_HOT,
+                           rb.GetBitmapNamed(IDR_NEWTAB_BUTTON_H));
+
+  newtab_button_size_.SetSize(bitmap->width(), bitmap->height());
+  actual_newtab_button_size_ = newtab_button_size_;
+
+  newtab_button_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_NEWTAB));
+  AddChildView(newtab_button_);
 
   if (drop_indicator_width == 0) {
     // Direction doesn't matter, both images are the same size.
     SkBitmap* drop_image = GetDropArrowImage(true);
     drop_indicator_width = drop_image->width();
     drop_indicator_height = drop_image->height();
   }
 }
 
-void TabStrip::LoadNewTabButtonImage() {
-  ThemeProvider* tp = GetThemeProvider();
-
-  SkBitmap* bitmap = tp->GetBitmapNamed(IDR_NEWTAB_BUTTON);
-  SkColor color = tp->GetColor(BrowserThemeProvider::COLOR_BUTTON_BACKGROUND);
-  SkBitmap* background = tp->GetBitmapNamed(
-      IDR_THEME_WINDOW_CONTROL_BACKGROUND);
-
-  newtab_button_->SetImage(views::CustomButton::BS_NORMAL, bitmap);
-  newtab_button_->SetImage(views::CustomButton::BS_PUSHED,
-                           tp->GetBitmapNamed(IDR_NEWTAB_BUTTON_P));
-  newtab_button_->SetImage(views::CustomButton::BS_HOT,
-                           tp->GetBitmapNamed(IDR_NEWTAB_BUTTON_H));
-  newtab_button_->SetBackground(color, background,
-                                tp->GetBitmapNamed(IDR_NEWTAB_BUTTON_MASK));
-  newtab_button_size_.SetSize(bitmap->width(), bitmap->height());
-}
-
 Tab* TabStrip::GetTabAt(int index) const {
   DCHECK(index >= 0 && index < GetTabCount());
   return tab_data_.at(index).tab;
 }
 
 Tab* TabStrip::GetTabAtAdjustForAnimation(int index) const {
   if (active_animation_.get() &&
       active_animation_->type() == TabAnimation::REMOVE &&
       index >=
       static_cast<RemoveTabAnimation*>(active_animation_.get())->index()) {
@@ skipping 464 matching lines @@
               &TabStrip::ResizeLayoutTabs),
           kResizeTabsTimeMs);
     }
   } else {
     // Mouse moved quickly out of the tab strip and then into it again, so
     // cancel the timer so that the strip doesn't move when the mouse moves
     // back over it.
     resize_layout_factory_.RevokeAll();
   }
 }