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

chrome/browser/ui/panels/panel_browser_window_gtk.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_window_gtk.h"
 
 #include "base/bind.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 30 matching lines @@
 const SkColor kMinimizeBackgroundDefaultColor = SkColorSetRGB(0xf5, 0xf4, 0xf0);
 const SkColor kMinimizeBorderDefaultColor = SkColorSetRGB(0xc9, 0xc9, 0xc9);
 
 // Color used to draw the divider line between the titlebar and the client area.
 const SkColor kDividerColor = SkColorSetRGB(0x2a, 0x2c, 0x2c);
 
 // Set minimium width for window really small.
 const int kMinWindowWidth = 26;
 
 gfx::Image* 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::Image(gfx::ImageSkia(canvas.ExtractImageRep()));
+  return new gfx::Image(canvas.ExtractBitmap());
 }
 
 const gfx::Image* GetActiveBackgroundDefaultImage() {
   static gfx::Image* image = NULL;
   if (!image)
     image = CreateImageForColor(kActiveBackgroundDefaultColor);
   return image;
 }
 
 const gfx::Image* GetInactiveBackgroundDefaultImage() {
@@ skipping 694 matching lines @@
       break;
     case panel::RESTORE_BUTTON:
       button = titlebar->restore_button();
       break;
     default:
       NOTREACHED();
       return false;
   }
   return gtk_widget_get_visible(button->widget());
 }