Cleanup gfx::Canvas now that 10562027 has landed

chrome/browser/ui/panels/panel_frame_view.cc

 // Copyright (c) 2012 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/ui/panels/panel_frame_view.h"
 
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_constants.h"
@@ skipping 91 matching lines @@
     top_right = rb.GetImageSkiaNamed(top_right_id);
     right = rb.GetImageSkiaNamed(right_id);
     bottom_right = rb.GetImageSkiaNamed(bottom_right_id);
     bottom = rb.GetImageSkiaNamed(bottom_id);
     bottom_left = rb.GetImageSkiaNamed(bottom_left_id);
     left = rb.GetImageSkiaNamed(left_id);
   }
 };
 
 gfx::ImageSkia* CreateImageForColor(SkColor color) {
-  gfx::Canvas canvas(gfx::Size(1, 1), true);
+  gfx::Canvas canvas(gfx::Size(1, 1), ui::SCALE_FACTOR_100P, true);
   canvas.DrawColor(color);
-  return new gfx::ImageSkia(canvas.ExtractBitmap());
+  return new gfx::ImageSkia(canvas.ExtractImageRep());
 }
 
 const EdgeResources& GetFrameEdges() {
   static EdgeResources* edges = NULL;
   if (!edges) {
     edges = new EdgeResources(
         IDR_WINDOW_TOP_LEFT_CORNER, IDR_WINDOW_TOP_CENTER,
         IDR_WINDOW_TOP_RIGHT_CORNER, IDR_WINDOW_RIGHT_SIDE,
         IDR_PANEL_BOTTOM_RIGHT_CORNER, IDR_WINDOW_BOTTOM_CENTER,
         IDR_PANEL_BOTTOM_LEFT_CORNER, IDR_WINDOW_LEFT_SIDE);
@@ skipping 500 matching lines @@
 
 void PanelFrameView::PaintDivider(gfx::Canvas* canvas) {
   // Draw the divider between the titlebar and the client area only if the panel
   // is big enough to show more than the titlebar.
   if (height() > TitlebarHeight()) {
     canvas->DrawLine(gfx::Point(0, panel::kTitlebarHeight - 1),
                      gfx::Point(width() - 1, panel::kTitlebarHeight - 1),
                      kDividerColor);
   }
 }