diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 20:54:48 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 20:54:48 +0000 |
| commit | 96c2e8ec18feb0766c22acfb481a59f0983c572a (patch) | |
| tree | 3b1d3f8312d8bdb9bc789bf9859298368021b681 /chrome/browser/gtk/custom_button.cc | |
| parent | 9520ab113d86539f1deba7d107776f0b8ee72a12 (diff) | |
| download | chromium_src-96c2e8ec18feb0766c22acfb481a59f0983c572a.zip chromium_src-96c2e8ec18feb0766c22acfb481a59f0983c572a.tar.gz chromium_src-96c2e8ec18feb0766c22acfb481a59f0983c572a.tar.bz2 | |
Reverting 26975.
Review URL: http://codereview.chromium.org/222011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/custom_button.cc')
| -rw-r--r-- | chrome/browser/gtk/custom_button.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/gtk/custom_button.cc b/chrome/browser/gtk/custom_button.cc index 3e4e1cf..745f495 100644 --- a/chrome/browser/gtk/custom_button.cc +++ b/chrome/browser/gtk/custom_button.cc @@ -4,7 +4,6 @@ #include "chrome/browser/gtk/custom_button.h" -#include "app/gfx/skbitmap_operations.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" @@ -16,6 +15,7 @@ #include "chrome/common/gtk_util.h" #include "chrome/common/notification_service.h" #include "grit/theme_resources.h" +#include "skia/ext/image_operations.h" CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeProvider* theme_provider, int normal_id, int active_id, int highlight_id, int depressed_id) @@ -104,8 +104,8 @@ void CustomDrawButtonBase::SetBackground(SkColor color, background_image_->UsePixbuf(NULL); } } else { - SkBitmap img = - SkBitmapOperations::CreateButtonBackground(color, *image, *mask); + SkBitmap img = skia::ImageOperations::CreateButtonBackground(color, + *image, *mask); GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&img); background_image_->UsePixbuf(pixbuf); |