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

trunk/src/chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 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/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 191 matching lines @@
   SkPaint paint;
   paint.setAntiAlias(false);
   // Sets border to 1-px thick regardless of scale factor.
   paint.setStrokeWidth(0);
   // Bottom border is at 50% opacity of top border.
   paint.setColor(SkColorSetA(separator_color,
                              SkColorGetA(separator_color) / 2));
   // Calculate thickness of bottom border as per current scale factor to
   // determine where to draw the 1-px thick border.
   float thickness = views::NonClientFrameView::kClientEdgeThickness /
-                    canvas->image_scale();
+                    ui::GetScaleFactorScale(canvas->scale_factor());
   SkScalar y = SkIntToScalar(view->height()) - SkFloatToScalar(thickness);
   canvas->sk_canvas()->drawLine(SkIntToScalar(0), y,
                                 SkIntToScalar(view->width()), y, paint);
 }
 
 void PaintAttachedBookmarkBar(gfx::Canvas* canvas,
                               DetachableToolbarView* view,
                               BrowserView* browser_view,
                               chrome::HostDesktopType host_desktop_type,
                               int toolbar_overlap) {
@@ skipping 2455 matching lines @@
     // The +1 in the next line creates a 1-px gap between icon and arrow tip.
     gfx::Point icon_bottom(0, location_icon_view->GetImageBounds().bottom() -
         LocationBarView::kIconInternalPadding + 1);
     ConvertPointToTarget(location_icon_view, this, &icon_bottom);
     gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
     ConvertPointToTarget(infobar_container_, this, &infobar_top);
     top_arrow_height = infobar_top.y() - icon_bottom.y();
   }
   return top_arrow_height;
 }