Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed

chrome/browser/ui/panels/panel_browser_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_browser_frame_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/themes/theme_service.h"
@@ skipping 132 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), ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(gfx::Size(1, 1), true);
   canvas.DrawColor(color);
-  return new gfx::ImageSkia(canvas.ExtractImageRep());
+  return new gfx::ImageSkia(canvas.ExtractBitmap());
 }
 
 const ButtonResources& GetCloseButtonResources() {
   static ButtonResources* buttons = NULL;
   if (!buttons) {
     buttons = new ButtonResources(IDR_PANEL_CLOSE,
                                   IDR_PANEL_CLOSE_H,
                                   IDR_PANEL_CLOSE_C,
                                   IDS_PANEL_CLOSE_TOOLTIP);
   }
@@ skipping 632 matching lines @@
 }
 
 bool PanelBrowserFrameView::CanResize() const {
   return panel_browser_view_->panel()->CanResizeByMouse() !=
       panel::NOT_RESIZABLE;
 }
 
 bool PanelBrowserFrameView::IsShowingTitlebarOnly() const {
   return height() <= panel::kTitlebarHeight;
 }