Remove dependency on ui::ScaleFactor from ui/gfx

chrome/browser/ui/views/tabs/tab_strip.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/views/tabs/tab_strip.h"
 
 #if defined(OS_WIN)
 #include <windowsx.h>
 #endif
 
@@ skipping 375 matching lines @@
 
     destroyed_ = NULL;
     SetState(views::CustomButton::STATE_NORMAL);
     return;
   }
   views::ImageButton::OnMouseReleased(event);
 }
 #endif
 
 void NewTabButton::OnPaint(gfx::Canvas* canvas) {
-  gfx::ImageSkia image = GetImageForScale(canvas->scale_factor());
+  gfx::ImageSkia image =
+      GetImageForScale(ui::GetSupportedScaleFactor(canvas->image_scale()));
   canvas->DrawImageInt(image, 0, height() - image.height());
 }
 
 void NewTabButton::OnGestureEvent(ui::GestureEvent* event) {
   // Consume all gesture events here so that the parent (Tab) does not
   // start consuming gestures.
   views::ImageButton::OnGestureEvent(event);
   event->SetHandled();
 }
 
@@ skipping 29 matching lines @@
       break;
     default:
       NOTREACHED();
       break;
   }
 
   gfx::ImageSkia* mask =
       GetThemeProvider()->GetImageSkiaNamed(IDR_NEWTAB_BUTTON_MASK);
   int height = mask->height();
   int width = mask->width();
-
+  float scale = ui::GetImageScale(scale_factor);
   // The canvas and mask has to use the same scale factor.
-  if (!mask->HasRepresentation(scale_factor))
+  if (!mask->HasRepresentation(scale))
     scale_factor = ui::SCALE_FACTOR_100P;
 
-  gfx::Canvas canvas(gfx::Size(width, height), scale_factor, false);
+  gfx::Canvas canvas(gfx::Size(width, height), scale, false);
 
   // For custom images the background starts at the top of the tab strip.
   // Otherwise the background starts at the top of the frame.
   gfx::ImageSkia* background =
       GetThemeProvider()->GetImageSkiaNamed(background_id);
   int offset_y = GetThemeProvider()->HasCustomImage(background_id) ?
       0 : background_offset_.y();
 
   // The new tab background is mirrored in RTL mode, but the theme background
   // should never be mirrored. Mirror it here to compensate.
@@ skipping 25 matching lines @@
 }
 
 gfx::ImageSkia NewTabButton::GetImageForState(
     views::CustomButton::ButtonState state,
     ui::ScaleFactor scale_factor) const {
   const int overlay_id = state == views::CustomButton::STATE_PRESSED ?
         IDR_NEWTAB_BUTTON_P : IDR_NEWTAB_BUTTON;
   gfx::ImageSkia* overlay = GetThemeProvider()->GetImageSkiaNamed(overlay_id);
 
   gfx::Canvas canvas(
-      gfx::Size(overlay->width(), overlay->height()), scale_factor, false);
+      gfx::Size(overlay->width(), overlay->height()),
+      ui::GetImageScale(scale_factor),
+      false);
   canvas.DrawImageInt(GetBackgroundImage(state, scale_factor), 0, 0);
 
   // Draw the button border with a slight alpha.
   const int kNativeFrameOverlayAlpha = 178;
   const int kOpaqueFrameOverlayAlpha = 230;
   uint8 alpha = ShouldUseNativeFrame() ?
       kNativeFrameOverlayAlpha : kOpaqueFrameOverlayAlpha;
   canvas.DrawImageInt(*overlay, 0, 0, alpha);
 
   return gfx::ImageSkia(canvas.ExtractImageRep());
@@ skipping 2204 matching lines @@
   if (!adjust_layout_)
     return false;
 
 #if !defined(OS_CHROMEOS)
   if (ui::GetDisplayLayout() != ui::LAYOUT_TOUCH)
     return false;
 #endif
 
   return true;
 }