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

chrome/browser/ui/gtk/tabs/tab_renderer_gtk.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_TABS_TAB_RENDERER_GTK_H_
 #define CHROME_BROWSER_UI_GTK_TABS_TAB_RENDERER_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
-#include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/image/cairo_cached_surface.h"
 #include "ui/gfx/rect.h"
 
 namespace gfx {
+class CairoCachedSurface;
 class Size;
 }  // namespace gfx
 
-class CairoCachedSurface;
 class CustomDrawButton;
 class TabContents;
 class GtkThemeService;
 
 namespace ui {
 class SlideAnimation;
 class ThrobAnimation;
 }
 
 class TabRendererGtk : public ui::AnimationDelegate,
@@ skipping 193 matching lines @@
   class FaviconCrashAnimation;
 
   // Model data. We store this here so that we don't need to ask the underlying
   // model, which is tricky since instances of this object can outlive the
   // corresponding objects in the underlying model.
   struct TabData {
     TabData();
     ~TabData();
 
     SkBitmap favicon;
-    CairoCachedSurface cairo_favicon;
+    gfx::CairoCachedSurface cairo_favicon;
     bool is_default_favicon;
     string16 title;
     bool loading;
     bool crashed;
     bool incognito;
     bool show_icon;
     bool mini;
     bool blocked;
     bool animating_mini_change;
     bool app;
@@ skipping 37 matching lines @@
   void PaintIcon(GtkWidget* widget, cairo_t* cr);
   void PaintTabBackground(GtkWidget* widget, cairo_t* cr);
   void PaintInactiveTabBackground(GtkWidget* widget, cairo_t* cr);
   void PaintActiveTabBackground(GtkWidget* widget, cairo_t* cr);
   void PaintLoadingAnimation(GtkWidget* widget, cairo_t* cairo);
 
   // Draws the given |tab_bg| onto |cr| using the tab shape masks along the
   // sides for the rounded tab shape.
   void DrawTabBackground(cairo_t* cr,
                          GtkWidget* widget,
-                         CairoCachedSurface* tab_bg,
+                         gfx::CairoCachedSurface* tab_bg,
                          int offset_x,
                          int offset_y);
 
   // Draws the tab shadow using the given idr resources onto |cr|.
   void DrawTabShadow(cairo_t* cr,
                      GtkWidget* widget,
                      int left_idr,
                      int center_idr,
                      int right_idr);
 
@@ skipping 107 matching lines @@
   // Color of the title text on the selected tab.
   SkColor selected_title_color_;
 
   // Color of the title text on an unselected tab.
   SkColor unselected_title_color_;
 
   DISALLOW_COPY_AND_ASSIGN(TabRendererGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_TABS_TAB_RENDERER_GTK_H_