Canvas refactoring part 2....

chrome/browser/views/toolbar_view.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/toolbar_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/bookmark_menu_button.h"
 #include "chrome/browser/views/browser_actions_container.h"
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/wrench_menu_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/canvas.h"
+#include "gfx/canvas_skia.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "gfx/skbitmap_operations.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/button_dropdown.h"
 #include "views/focus/view_storage.h"
 #include "views/widget/tooltip_manager.h"
 #include "views/window/non_client_view.h"
 #include "views/window/window.h"
 
@@ skipping 619 matching lines @@
   ThemeProvider* tp = GetThemeProvider();
 
   // We use different menu button images if the locale is right-to-left.
   SkBitmap icon = *tp->GetBitmapNamed(
       base::i18n::IsRTL() ? IDR_MENU_CHROME_RTL : IDR_MENU_CHROME);
 
   if (!Singleton<UpgradeDetector>::get()->notify_upgrade())
     return icon;
 
   // Draw the chrome app menu icon onto the canvas.
-  scoped_ptr<gfx::Canvas> canvas(
-      new gfx::Canvas(icon.width(), icon.height(), false));
+  scoped_ptr<gfx::CanvasSkia> canvas(
+      new gfx::CanvasSkia(icon.width(), icon.height(), false));
   canvas->DrawBitmapInt(icon, 0, 0);
 
   SkBitmap badge;
   static bool has_faded_in = false;
   if (!has_faded_in) {
     SkBitmap* dot = tp->GetBitmapNamed(IDR_UPGRADE_DOT_INACTIVE);
     SkBitmap transparent;
     transparent.setConfig(dot->getConfig(), dot->width(), dot->height());
     transparent.allocPixels();
     transparent.eraseARGB(0, 0, 0, 0);
@@ skipping 103 matching lines @@
   }
 #endif
 
   // Tell the menu button to activate, opening its pop-up menu.
   menu_button->Activate();
 
 #if defined(OS_WIN)
   SetToolbarFocus(NULL, menu_button);
 #endif
 }