Relands fixes for 106432, 107287 and 107401. These got reverted

ui/aura_shell/launcher/tabbed_launcher_button.h

 // Copyright (c) 2011 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.
 
 #ifndef UI_AURA_SHELL_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_
 #define UI_AURA_SHELL_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_
 #pragma once
 
 #include "ui/aura_shell/launcher/launcher_types.h"
-#include "ui/views/controls/button/custom_button.h"
+#include "ui/views/controls/button/image_button.h"
 
 namespace aura_shell {
 namespace internal {
 
 class LauncherButtonHost;
 
 // Button used for items on the launcher corresponding to tabbed windows.
-class TabbedLauncherButton : public views::CustomButton {
+class TabbedLauncherButton : public views::ImageButton {
  public:
   TabbedLauncherButton(views::ButtonListener* listener,
                        LauncherButtonHost* host);
   virtual ~TabbedLauncherButton();
 
   // Sets the images to display for this entry.
   void SetImages(const LauncherTabbedImages& images);
 
-  // View overrides:
-  virtual gfx::Size GetPreferredSize() OVERRIDE;
-
  protected:
   // View overrides:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseCaptureLost() OVERRIDE;
   virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
 
  private:
+  struct ImageSet {
+    SkBitmap* normal_image;
+    SkBitmap* pushed_image;
+    SkBitmap* hot_image;
+  };
+
+  // Creates an ImageSet using the specified image ids. Caller owns the returned
+  // value.
+  static ImageSet* CreateImageSet(int normal_id, int pushed_id, int hot_id);
+
   LauncherTabbedImages images_;
 
   LauncherButtonHost* host_;
 
   // Background images. Which one is chosen depends upon how many images are
   // provided.
-  static SkBitmap* bg_image_1_;
-  static SkBitmap* bg_image_2_;
-  static SkBitmap* bg_image_3_;
+  static ImageSet* bg_image_1_;
+  static ImageSet* bg_image_2_;
+  static ImageSet* bg_image_3_;
 
   DISALLOW_COPY_AND_ASSIGN(TabbedLauncherButton);
 };
 
 }  // namespace internal
 }  // namespace aura_shell
 
 #endif  // UI_AURA_SHELL_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_