Reverting 19758.

chrome/browser/views/frame/opaque_browser_frame_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/frame/opaque_browser_frame_view.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
@@ skipping 99 matching lines @@
       minimize_button_(new views::ImageButton(this)),
       maximize_button_(new views::ImageButton(this)),
       restore_button_(new views::ImageButton(this)),
       close_button_(new views::ImageButton(this)),
       window_icon_(NULL),
       frame_(frame),
       browser_view_(browser_view) {
   InitClass();
 
   ThemeProvider* tp = frame_->GetThemeProviderForFrame();
-  SkColor color = tp->GetColor(BrowserThemeProvider::COLOR_BUTTON_BACKGROUND);
-  SkBitmap* background =
-      tp->GetBitmapNamed(IDR_THEME_WINDOW_CONTROL_BACKGROUND);
 
   minimize_button_->SetImage(
       views::CustomButton::BS_NORMAL,
       tp->GetBitmapNamed(IDR_MINIMIZE));
   minimize_button_->SetImage(
       views::CustomButton::BS_HOT,
       tp->GetBitmapNamed(IDR_MINIMIZE_H));
   minimize_button_->SetImage(
       views::CustomButton::BS_PUSHED,
       tp->GetBitmapNamed(IDR_MINIMIZE_P));
-  minimize_button_->SetBackground(color, background,
-      tp->GetBitmapNamed(IDR_MINIMIZE_BUTTON_MASK));
   minimize_button_->SetAccessibleName(
       l10n_util::GetString(IDS_ACCNAME_MINIMIZE));
   AddChildView(minimize_button_);
 
   maximize_button_->SetImage(
       views::CustomButton::BS_NORMAL,
       tp->GetBitmapNamed(IDR_MAXIMIZE));
   maximize_button_->SetImage(
       views::CustomButton::BS_HOT,
       tp->GetBitmapNamed(IDR_MAXIMIZE_H));
   maximize_button_->SetImage(
       views::CustomButton::BS_PUSHED,
       tp->GetBitmapNamed(IDR_MAXIMIZE_P));
-  maximize_button_->SetBackground(color, background,
-      tp->GetBitmapNamed(IDR_MAXIMIZE_BUTTON_MASK));
   maximize_button_->SetAccessibleName(
       l10n_util::GetString(IDS_ACCNAME_MAXIMIZE));
   AddChildView(maximize_button_);
 
   restore_button_->SetImage(
       views::CustomButton::BS_NORMAL,
       tp->GetBitmapNamed(IDR_RESTORE));
   restore_button_->SetImage(
       views::CustomButton::BS_HOT,
       tp->GetBitmapNamed(IDR_RESTORE_H));
   restore_button_->SetImage(
       views::CustomButton::BS_PUSHED,
       tp->GetBitmapNamed(IDR_RESTORE_P));
-  restore_button_->SetBackground(color, background,
-      tp->GetBitmapNamed(IDR_RESTORE_BUTTON_MASK));
   restore_button_->SetAccessibleName(
       l10n_util::GetString(IDS_ACCNAME_RESTORE));
   AddChildView(restore_button_);
 
   close_button_->SetImage(
       views::CustomButton::BS_NORMAL,
       tp->GetBitmapNamed(IDR_CLOSE));
   close_button_->SetImage(
       views::CustomButton::BS_HOT,
       tp->GetBitmapNamed(IDR_CLOSE_H));
   close_button_->SetImage(
       views::CustomButton::BS_PUSHED,
       tp->GetBitmapNamed(IDR_CLOSE_P));
-  close_button_->SetBackground(color, background,
-      tp->GetBitmapNamed(IDR_CLOSE_BUTTON_MASK));
   close_button_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_CLOSE));
   AddChildView(close_button_);
 
   // Initializing the TabIconView is expensive, so only do it if we need to.
   if (browser_view_->ShouldShowWindowIcon()) {
     window_icon_ = new TabIconView(this);
     window_icon_->set_is_light(true);
     AddChildView(window_icon_);
     window_icon_->Update();
   }
@@ skipping 816 matching lines @@
   if (!initialized) {
 #if defined(OS_WIN)
     title_font_ = new gfx::Font(win_util::GetWindowTitleFont());
 #else
     NOTIMPLEMENTED();
     title_font_ = new gfx::Font();
 #endif
     initialized = true;
   }
 }