GetScaleFactorForNativeView should return scale factor in float

ui/message_center/views/notification_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 "ui/message_center/views/notification_view.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 64 matching lines @@
 scoped_ptr<views::Border> MakeSeparatorBorder(int top,
                                               int left,
                                               SkColor color) {
   return views::Border::CreateSolidSidedBorder(top, left, 0, 0, color);
 }
 
 // static
 // Return true if and only if the image is null or has alpha.
 bool HasAlpha(gfx::ImageSkia& image, views::Widget* widget) {
   // Determine which bitmap to use.
-  ui::ScaleFactor factor = ui::SCALE_FACTOR_100P;
-  if (widget) {
+  float factor = 1.0f;
+  if (widget)
     factor = ui::GetScaleFactorForNativeView(widget->GetNativeView());
-    if (factor == ui::SCALE_FACTOR_NONE)
-      factor = ui::SCALE_FACTOR_100P;
-  }
 
   // Extract that bitmap's alpha and look for a non-opaque pixel there.
-  SkBitmap bitmap =
-      image.GetRepresentation(ui::GetImageScale(factor)).sk_bitmap();
+  SkBitmap bitmap = image.GetRepresentation(factor).sk_bitmap();
   if (!bitmap.isNull()) {
     SkBitmap alpha;
     bitmap.extractAlpha(&alpha);
     for (int y = 0; y < bitmap.height(); ++y) {
       for (int x = 0; x < bitmap.width(); ++x) {
         if (alpha.getColor(x, y) != SK_ColorBLACK) {
           return true;
         }
       }
     }
@@ skipping 658 matching lines @@
 
   return message_line_limit;
 }
 
 int NotificationView::GetMessageHeight(int width, int limit) {
   return message_view_ ?
          message_view_->GetSizeForWidthAndLines(width, limit).height() : 0;
 }
 
 }  // namespace message_center