GTK: Move CairoCachedSurface from being owned by GtkThemeService to gfx::Image.

chrome/browser/ui/gtk/custom_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 CHROME_BROWSER_UI_GTK_CUSTOM_BUTTON_H_
 #define CHROME_BROWSER_UI_GTK_CUSTOM_BUTTON_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
 #include "ui/gfx/rect.h"
 
-class CairoCachedSurface;
 class GtkThemeService;
 class SkBitmap;
 
+namespace gfx {
+class CairoCachedSurface;
+}
+
 // 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 content::NotificationObserver {
  public:
   // If the images come from ResourceBundle rather than the theme provider,
   // pass in NULL for |theme_provider|.
@@ skipping 21 matching lines @@
   // Set the background details.
   void SetBackground(SkColor color, SkBitmap* image, SkBitmap* mask);
 
   // Provide content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
   // Get the CairoCachedSurface from |surfaces_| for |state|.
-  CairoCachedSurface* PixbufForState(int state);
+  gfx::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];
+  scoped_ptr<gfx::CairoCachedSurface> surfaces_[GTK_STATE_INSENSITIVE + 1];
 
   // The background image.
-  scoped_ptr<CairoCachedSurface> background_image_;
+  scoped_ptr<gfx::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_;
@@ skipping 138 matching lines @@
   // True if we should never do gtk rendering.
   bool forcing_chrome_theme_;
 
   // Used to listen for theme change notifications.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomDrawButton);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_CUSTOM_BUTTON_H_