Canvas refactoring part 3....

chrome/browser/chromeos/status/network_menu_button.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/chromeos/status/network_menu_button.h"
 
 #include <limits>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/status/status_area_host.h"
-#include "gfx/canvas.h"
+#include "gfx/canvas_skia.h"
 #include "gfx/skbitmap_operations.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 namespace chromeos {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton
@@ skipping 354 matching lines @@
   // Icons are 24x24.
   static const int kIconWidth = 24;
   static const int kIconHeight = 24;
   // Draw the network icon 3 pixels down to center it.
   static const int kIconX = 0;
   static const int kIconY = 3;
   // Draw badge at (14,14).
   static const int kBadgeX = 14;
   static const int kBadgeY = 14;
 
-  gfx::Canvas canvas(kIconWidth, kIconHeight, false);
+  gfx::CanvasSkia canvas(kIconWidth, kIconHeight, false);
   canvas.DrawBitmapInt(icon, kIconX, kIconY);
   if (!badge.empty())
     canvas.DrawBitmapInt(badge, kBadgeX, kBadgeY);
   return canvas.ExtractBitmap();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton, views::ViewMenuDelegate implementation:
 
 void NetworkMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
@@ skipping 115 matching lines @@
     if (host_->ShouldOpenButtonOptions(this)) {
       label =
           l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG);
       menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label,
           SkBitmap(), WifiNetwork(), CellularNetwork(), FLAG_OPTIONS));
     }
   }
 }
 
 }  // namespace chromeos