Move chrome/browser/gtk/ to chrome/browser/ui/gtk/...

chrome/browser/gtk/custom_button.h

Index: chrome/browser/gtk/custom_button.h
===================================================================
--- chrome/browser/gtk/custom_button.h	(revision 71352)
+++ chrome/browser/gtk/custom_button.h	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -6,222 +6,7 @@
 #define CHROME_BROWSER_GTK_CUSTOM_BUTTON_H_
 #pragma once
 
-#include <gtk/gtk.h>
+#include "chrome/browser/ui/gtk/custom_button.h"
+// TODO(msw): remove this file once all includes have been updated.
 
-#include "app/gtk_signal.h"
-#include "base/scoped_ptr.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
-#include "chrome/common/notification_observer.h"
-#include "chrome/common/notification_registrar.h"
-#include "gfx/rect.h"
-#include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/slide_animation.h"
-
-class CairoCachedSurface;
-class GtkThemeProvider;
-class SkBitmap;
-
-// These classes implement two kinds of custom-drawn buttons.  They're
-// used on the toolbar and the bookmarks bar.
-
-// CustomDrawButtonBase provides the base for building a custom drawn button.
-// It handles managing the pixbufs containing all the static images used to draw
-// the button.  It also manages painting these pixbufs.
-class CustomDrawButtonBase : public NotificationObserver {
- public:
-  // If the images come from ResourceBundle rather than the theme provider,
-  // pass in NULL for |theme_provider|.
-  CustomDrawButtonBase(GtkThemeProvider* theme_provider,
-                       int normal_id,
-                       int pressed_id,
-                       int hover_id,
-                       int disabled_id);
-
-  ~CustomDrawButtonBase();
-
-  // Flip the image horizontally. Not to be used for RTL/LTR reasons. (In RTL
-  // mode, this will unflip the image.)
-  void set_flipped(bool flipped) { flipped_ = flipped; }
-
-  // Returns the dimensions of the first surface.
-  int Width() const;
-  int Height() const;
-
-  gboolean OnExpose(GtkWidget* widget, GdkEventExpose* e, gdouble hover_state);
-
-  void set_paint_override(int state) { paint_override_ = state; }
-  int paint_override() const { return paint_override_; }
-
-  // Set the background details.
-  void SetBackground(SkColor color, SkBitmap* image, SkBitmap* mask);
-
-  // Provide NotificationObserver implementation.
-  virtual void Observe(NotificationType type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
-
- private:
-  // Get the CairoCachedSurface from |surfaces_| for |state|.
-  CairoCachedSurface* PixbufForState(int state);
-
-  // We store one surface for each possible state of the button;
-  // INSENSITIVE is the last available state;
-  scoped_ptr<CairoCachedSurface> surfaces_[GTK_STATE_INSENSITIVE + 1];
-
-  // The background image.
-  scoped_ptr<CairoCachedSurface> background_image_;
-
-  // If non-negative, the state to paint the button.
-  int paint_override_;
-
-  // We need to remember the image ids that the user passes in and the theme
-  // provider so we can reload images if the user changes theme.
-  int normal_id_;
-  int pressed_id_;
-  int hover_id_;
-  int disabled_id_;
-  GtkThemeProvider* theme_provider_;
-
-  // Whether the button is flipped horizontally. Not used for RTL (we get
-  // flipped versions from the theme provider). Used for the flipped window
-  // buttons.
-  bool flipped_;
-
-  // Used to listen for theme change notifications.
-  NotificationRegistrar registrar_;
-
-  DISALLOW_COPY_AND_ASSIGN(CustomDrawButtonBase);
-};
-
-// CustomDrawHoverController is a convenience class that eases the common task
-// of controlling the hover state of a button. The "hover state" refers to the
-// percent opacity of a button's PRELIGHT. The PRELIGHT is animated such that
-// when a user moves a mouse over a button the PRELIGHT fades in.
-class CustomDrawHoverController : public ui::AnimationDelegate {
- public:
-  explicit CustomDrawHoverController(GtkWidget* widget);
-  CustomDrawHoverController();
-
-  virtual ~CustomDrawHoverController();
-
-  void Init(GtkWidget* widget);
-
-  double GetCurrentValue() {
-    return slide_animation_.GetCurrentValue();
-  }
-
- private:
-  virtual void AnimationProgressed(const ui::Animation* animation);
-
-  CHROMEGTK_CALLBACK_1(CustomDrawHoverController, gboolean, OnEnter,
-                       GdkEventCrossing*);
-  CHROMEGTK_CALLBACK_1(CustomDrawHoverController, gboolean, OnLeave,
-                       GdkEventCrossing*);
-
-  ui::SlideAnimation slide_animation_;
-  GtkWidget* widget_;
-};
-
-// CustomDrawButton is a plain button where all its various states are drawn
-// with static images. In GTK rendering mode, it will show the standard button
-// with GTK |stock_id|.
-class CustomDrawButton : public NotificationObserver {
- public:
-  // The constructor takes 4 resource ids.  If a resource doesn't exist for a
-  // button, pass in 0.
-  CustomDrawButton(int normal_id,
-                   int pressed_id,
-                   int hover_id,
-                   int disabled_id);
-
-  // Same as above, but uses themed (and possibly tinted) images. |stock_id| and
-  // |stock_size| are used for GTK+ theme mode.
-  CustomDrawButton(GtkThemeProvider* theme_provider,
-                   int normal_id,
-                   int pressed_id,
-                   int hover_id,
-                   int disabled_id,
-                   const char* stock_id,
-                   GtkIconSize stock_size);
-
-  // As above, but uses an arbitrary GtkImage rather than a stock icon. This
-  // constructor takes ownership of |native_widget|.
-  CustomDrawButton(GtkThemeProvider* theme_provider,
-                   int normal_id,
-                   int pressed_id,
-                   int hover_id,
-                   int disabled_id,
-                   GtkWidget* native_widget);
-
-  ~CustomDrawButton();
-
-  void Init();
-
-  // Flip the image horizontally. Not to be used for RTL/LTR reasons. (In RTL
-  // mode, this will unflip the image.)
-  void set_flipped(bool flipped) { button_base_.set_flipped(flipped); }
-
-  GtkWidget* widget() const { return widget_.get(); }
-
-  gfx::Rect bounds() const {
-      return gfx::Rect(widget_->allocation.x,
-                       widget_->allocation.y,
-                       widget_->allocation.width,
-                       widget_->allocation.height);
-  }
-
-  int width() const { return widget_->allocation.width; }
-  int height() const { return widget_->allocation.height; }
-
-  // Set the state to draw. We will paint the widget as if it were in this
-  // state.
-  void SetPaintOverride(GtkStateType state);
-
-  // Resume normal drawing of the widget's state.
-  void UnsetPaintOverride();
-
-  // Set the background details.
-  void SetBackground(SkColor color, SkBitmap* image, SkBitmap* mask);
-
-  // NotificationObserver implementation.
-  virtual void Observe(NotificationType type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
-
-  // Returns a standard close button. Pass a |theme_provider| to use Gtk icons
-  // in Gtk rendering mode.
-  static CustomDrawButton* CloseButton(GtkThemeProvider* theme_provider);
-
- private:
-  // Sets the button to themed or not.
-  void SetBrowserTheme();
-
-  // Whether to use the GTK+ theme. For this to be true, we have to be in GTK+
-  // theme mode and we must have a valid stock icon resource.
-  bool UseGtkTheme();
-
-  // Callback for custom button expose, used to draw the custom graphics.
-  CHROMEGTK_CALLBACK_1(CustomDrawButton, gboolean, OnCustomExpose,
-                       GdkEventExpose*);
-
-  // The actual button widget.
-  OwnedWidgetGtk widget_;
-
-  CustomDrawButtonBase button_base_;
-
-  CustomDrawHoverController hover_controller_;
-
-  // The widget to use when we are displaying in GTK+ theme mode.
-  OwnedWidgetGtk native_widget_;
-
-  // Our theme provider.
-  GtkThemeProvider* theme_provider_;
-
-  // Used to listen for theme change notifications.
-  NotificationRegistrar registrar_;
-
-  DISALLOW_COPY_AND_ASSIGN(CustomDrawButton);
-};
-
 #endif  // CHROME_BROWSER_GTK_CUSTOM_BUTTON_H_