Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6832)

Unified Diff: chrome/views/button.cc

Issue 12842: Move convolver, image_operations, and skia_utils from base/gfx to skia/ext.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/views/background.cc ('k') | chrome/views/chrome_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/views/button.cc
===================================================================
--- chrome/views/button.cc (revision 6142)
+++ chrome/views/button.cc (working copy)
@@ -7,12 +7,12 @@
#include <atlbase.h>
#include <atlapp.h>
-#include "base/gfx/image_operations.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/common/gfx/chrome_canvas.h"
#include "chrome/common/l10n_util.h"
#include "chrome/common/throb_animation.h"
#include "chrome/views/event.h"
+#include "skia/ext/image_operations.h"
#include "generated_resources.h"
@@ -105,7 +105,7 @@
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()];
« no previous file with comments | « chrome/views/background.cc ('k') | chrome/views/chrome_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698