From 53c8fdf0f2abd695a66237d901a8d74eb45bb6d0 Mon Sep 17 00:00:00 2001 From: "brettw@google.com" Date: Wed, 10 Dec 2008 15:01:10 +0000 Subject: Remove base dependency from image_operations and associated unittests. I also renamed the namespace from "gfx" to "skia". This also adds back the image_operations_unittest to a project (this had gotten lost in my move). Review URL: http://codereview.chromium.org/13143 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6706 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/views/button.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/views') diff --git a/chrome/views/button.cc b/chrome/views/button.cc index 11dad29..36c228a 100644 --- a/chrome/views/button.cc +++ b/chrome/views/button.cc @@ -105,7 +105,7 @@ SkBitmap Button::GetImageToPaint() { SkBitmap img; if (!images_[BS_HOT].isNull() && hover_animation_->IsAnimating()) { - img = gfx::ImageOperations::CreateBlendedBitmap(images_[BS_NORMAL], + img = skia::ImageOperations::CreateBlendedBitmap(images_[BS_NORMAL], images_[BS_HOT], hover_animation_->GetCurrentValue()); } else { img = images_[GetState()]; -- cgit v1.1