Revert 50784 - Canvas refactoring part 3....

chrome/browser/views/infobars/translate_infobars.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_infobars.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/translate/languages_menu_model.h"
 #include "chrome/browser/translate/options_menu_model.h"
 #include "chrome/browser/translate/page_translated_details.h"
 #include "chrome/browser/views/infobars/infobar_button_border.h"
 #include "chrome/browser/views/infobars/infobar_text_button.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 
@@ skipping 717 matching lines @@
   }
 
   Layout();
   SchedulePaint();
 }
 
 void TranslateInfoBar::FadeBackground(gfx::Canvas* canvas,
     double animation_value, TranslateInfoBarDelegate::TranslateState state) {
   // Draw 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),
+  canvas->saveLayerAlpha(NULL, static_cast<int>(animation_value * 255),
       SkCanvas::kARGB_NoClipLayer_SaveFlag);
-  canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
+  canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
   GetBackground(state)->Paint(canvas, this);
-  canvas->AsCanvasSkia()->restore();
+  canvas->restore();
 }
 
 inline TranslateInfoBarDelegate* TranslateInfoBar::GetDelegate() const {
   return static_cast<TranslateInfoBarDelegate*>(delegate());
 }
 
 inline InfoBarBackground* TranslateInfoBar::GetBackground(
     TranslateInfoBarDelegate::TranslateState state) const {
   return (state == TranslateInfoBarDelegate::kTranslateError ?
       error_background_.get() : normal_background_.get());
 }
 
 inline int TranslateInfoBar::GetSpacingAfterFirstLanguageButton() const {
   return (state_ == TranslateInfoBarDelegate::kAfterTranslate ?
       kButtonInLabelSpacing : 10);
 }
 
 // TranslateInfoBarDelegate, InfoBarDelegate overrides: ------------------
 
 InfoBar* TranslateInfoBarDelegate::CreateInfoBar() {
   return new TranslateInfoBar(this);
 }