Revert 50784 - Canvas refactoring part 3....

chrome/browser/views/infobars/translate_infobar_base.cc

 // Copyright (c) 2010 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/browser/views/infobars/translate_infobar_base.h"
 
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/translate/translate_infobar_delegate2.h"
 #include "chrome/browser/views/infobars/after_translate_infobar.h"
 #include "chrome/browser/views/infobars/before_translate_infobar.h"
 #include "chrome/browser/views/infobars/translate_message_infobar.h"
 #include "chrome/browser/views/infobars/infobar_button_border.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "grit/app_resources.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/image_view.h"
 
 TranslateInfoBarBase::TranslateInfoBarBase(
     TranslateInfoBarDelegate2* delegate)
     : InfoBar(delegate),
       normal_background_(InfoBarDelegate::PAGE_ACTION_TYPE),
       error_background_(InfoBarDelegate::ERROR_TYPE) {
   icon_ = new views::ImageView;
@@ skipping 115 matching lines @@
 
 const InfoBarBackground& TranslateInfoBarBase::GetBackground() const {
   return GetDelegate()->IsError() ? error_background_ : normal_background_;
 }
 
 void TranslateInfoBarBase::FadeBackground(gfx::Canvas* canvas,
                                           double animation_value,
                                           const InfoBarBackground& background) {
   // Draw the background into an offscreen buffer with alpha value per animation
   // value, then blend it back into the current canvas.
-  canvas->AsCanvasSkia()->saveLayerAlpha(
-      NULL, static_cast<int>(animation_value * 255),
-      SkCanvas::kARGB_NoClipLayer_SaveFlag);
-  canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
+  canvas->saveLayerAlpha(NULL, static_cast<int>(animation_value * 255),
+                         SkCanvas::kARGB_NoClipLayer_SaveFlag);
+  canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
   background.Paint(canvas, this);
-  canvas->AsCanvasSkia()->restore();
+  canvas->restore();
 }
 
 // TranslateInfoBarDelegate views specific method:
 InfoBar* TranslateInfoBarDelegate2::CreateInfoBar() {
   TranslateInfoBarBase* infobar = NULL;
   switch (type_) {
     case BEFORE_TRANSLATE:
       infobar = new BeforeTranslateInfoBar(this);
       break;
     case AFTER_TRANSLATE:
       infobar = new AfterTranslateInfoBar(this);
       break;
     case TRANSLATING:
     case TRANSLATION_ERROR:
       infobar = new TranslateMessageInfoBar(this);
       break;
     default:
       NOTREACHED();
   }
   // Set |infobar_view_| so that the model can notify the infobar when it
   // changes.
   infobar_view_ = infobar;
   return infobar;
 }