Initial sets of fixes for themes to work well with HiDPI Windows. More changes coming in a separate…

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 209 matching lines @@
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
 #endif
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
   // Overridden from ui::EventHandler:
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
  private:
   bool ShouldWindowContentsBeTransparent() const;
   gfx::ImageSkia GetBackgroundImage(views::CustomButton::ButtonState state,
-                                    ui::ScaleFactor scale_factor) const;
+                                    float scale) const;
   gfx::ImageSkia GetImageForState(views::CustomButton::ButtonState state,
-                                  ui::ScaleFactor scale_factor) const;
-  gfx::ImageSkia GetImageForScale(ui::ScaleFactor scale_factor) const;
+                                  float scale) const;
+  gfx::ImageSkia GetImageForScale(float scale) const;
 
   // Tab strip that contains this button.
   TabStrip* tab_strip_;
 
   // The offset used to paint the background image.
   gfx::Point background_offset_;
 
   // were we destroyed?
   bool* destroyed_;
 
@@ skipping 56 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(ui::GetSupportedScaleFactor(canvas->image_scale()));
+  gfx::ImageSkia image = GetImageForScale(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();
 }
 
 bool NewTabButton::ShouldWindowContentsBeTransparent() const {
   return GetWidget() &&
          GetWidget()->GetTopLevelWidget()->ShouldWindowContentsBeTransparent();
 }
 
 gfx::ImageSkia NewTabButton::GetBackgroundImage(
     views::CustomButton::ButtonState state,
-    ui::ScaleFactor scale_factor) const {
+    float scale) const {
   int background_id = 0;
   if (ShouldWindowContentsBeTransparent()) {
     background_id = IDR_THEME_TAB_BACKGROUND_V;
   } else if (tab_strip_->controller()->IsIncognito()) {
     background_id = IDR_THEME_TAB_BACKGROUND_INCOGNITO;
   } else {
     background_id = IDR_THEME_TAB_BACKGROUND;
   }
 
   int alpha = 0;
   switch (state) {
     case views::CustomButton::STATE_NORMAL:
     case views::CustomButton::STATE_HOVERED:
       alpha = ShouldWindowContentsBeTransparent() ? kGlassFrameInactiveTabAlpha
                                                   : 255;
       break;
     case views::CustomButton::STATE_PRESSED:
       alpha = 145;
       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))
-    scale_factor = ui::SCALE_FACTOR_100P;
+    scale = ui::GetScaleForScaleFactor(ui::SCALE_FACTOR_100P);
 
   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();
 
@@ skipping 21 matching lines @@
   // White highlight on hover.
   if (state == views::CustomButton::STATE_HOVERED)
     canvas.FillRect(GetLocalBounds(), SkColorSetARGB(64, 255, 255, 255));
 
   return gfx::ImageSkiaOperations::CreateMaskedImage(
       gfx::ImageSkia(canvas.ExtractImageRep()), *mask);
 }
 
 gfx::ImageSkia NewTabButton::GetImageForState(
     views::CustomButton::ButtonState state,
-    ui::ScaleFactor scale_factor) const {
+    float scale) 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()),
-      ui::GetImageScale(scale_factor),
+      scale,
       false);
-  canvas.DrawImageInt(GetBackgroundImage(state, scale_factor), 0, 0);
+  canvas.DrawImageInt(GetBackgroundImage(state, scale), 0, 0);
 
   // Draw the button border with a slight alpha.
   const int kGlassFrameOverlayAlpha = 178;
   const int kOpaqueFrameOverlayAlpha = 230;
   uint8 alpha = ShouldWindowContentsBeTransparent() ?
       kGlassFrameOverlayAlpha : kOpaqueFrameOverlayAlpha;
   canvas.DrawImageInt(*overlay, 0, 0, alpha);
 
   return gfx::ImageSkia(canvas.ExtractImageRep());
 }
 
-gfx::ImageSkia NewTabButton::GetImageForScale(
-    ui::ScaleFactor scale_factor) const {
+gfx::ImageSkia NewTabButton::GetImageForScale(float scale) const {
   if (!hover_animation_->is_animating())
-    return GetImageForState(state(), scale_factor);
+    return GetImageForState(state(), scale);
   return gfx::ImageSkiaOperations::CreateBlendedImage(
-      GetImageForState(views::CustomButton::STATE_NORMAL, scale_factor),
-      GetImageForState(views::CustomButton::STATE_HOVERED, scale_factor),
+      GetImageForState(views::CustomButton::STATE_NORMAL, scale),
+      GetImageForState(views::CustomButton::STATE_HOVERED, scale),
       hover_animation_->GetCurrentValue());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStrip::RemoveTabDelegate
 //
 // AnimationDelegate used when removing a tab. Does the necessary cleanup when
 // done.
 class TabStrip::RemoveTabDelegate
     : public views::BoundsAnimator::OwnedAnimationDelegate {
@@ skipping 2204 matching lines @@
   else
     RemoveMessageLoopObserver();
 }
 
 bool TabStrip::GetAdjustLayout() const {
   if (!adjust_layout_)
     return false;
   return chrome::GetHostDesktopTypeForNativeView(
       GetWidget()->GetNativeView()) == chrome::HOST_DESKTOP_TYPE_ASH;
 }