Move Image operations and convolver to the skia namespace and clean up a few ...

chrome/views/button.cc

 // Copyright (c) 2006-2008 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.
 
 #include "chrome/views/button.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 87 matching lines @@
 
     canvas->DrawBitmapInt(img, x, y);
   }
   PaintFocusBorder(canvas);
 }
 
 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()];
   }
 
   return !img.isNull() ? img : images_[BS_NORMAL];
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ skipping 75 matching lines @@
   toggled_ = toggled;
   SchedulePaint();
 }
 
 void ToggleButton::SetToggledTooltipText(const std::wstring& tooltip) {
   toggled_tooltip_text_.assign(tooltip);
 }
 
 }  // namespace views