Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

trunk/src/chrome/browser/ui/gtk/infobars/extension_infobar_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/gtk/infobars/extension_infobar_gtk.h"
 
 #include "base/debug/trace_event.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/image_loader.h"
@@ skipping 153 matching lines @@
 
   SkBitmap bitmap;
   if (button_) {
     gfx::ImageSkia* drop_image = rb.GetImageSkiaNamed(IDR_APP_DROPARROW);
 
     int image_size = extension_misc::EXTENSION_ICON_BITTY;
     // The margin between the extension icon and the drop-down arrow bitmap.
     static const int kDropArrowLeftMargin = 3;
     scoped_ptr<gfx::Canvas> canvas(new gfx::Canvas(
         gfx::Size(image_size + kDropArrowLeftMargin + drop_image->width(),
-                  image_size), 1.0f, false));
+                  image_size), ui::SCALE_FACTOR_100P, false));
     canvas->DrawImageInt(*icon, 0, 0, icon->width(), icon->height(), 0, 0,
                          image_size, image_size, false);
     canvas->DrawImageInt(*drop_image, image_size + kDropArrowLeftMargin,
                          image_size / 2);
     bitmap = canvas->ExtractImageRep().sk_bitmap();
   } else {
     bitmap = *icon->bitmap();
   }
 
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(bitmap);
@@ skipping 55 matching lines @@
 gboolean ExtensionInfoBarGtk::OnExpose(GtkWidget* sender,
                                        GdkEventExpose* event) {
   TRACE_EVENT0("ui::gtk", "ExtensionInfoBarGtk::OnExpose");
 
   // We also need to draw our infobar arrows over the renderer.
   static_cast<InfoBarContainerGtk*>(container())->
       PaintInfobarBitsOn(sender, event, this);
 
   return FALSE;
 }