Type conversion fixes, ui/gfx/ edition.

ui/gfx/geometry/vector2d.h

 // 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.
 
 // Defines a simple integer vector class.  This class is used to indicate a
 // distance in two dimensions between two points. Subtracting two points should
 // produce a vector, and adding a vector to a point produces the point at the
 // vector's distance from the original point.
 
 #ifndef UI_GFX_GEOMETRY_VECTOR2D_H_
@@ skipping 42 matching lines @@
 
   // Gives the square of the diagonal length of the vector. Since this is
   // cheaper to compute than Length(), it is useful when you want to compare
   // relative lengths of different vectors without needing the actual lengths.
   int64 LengthSquared() const;
   // Gives the diagonal length of the vector.
   float Length() const;
 
   std::string ToString() const;
 
-  operator Vector2dF() const { return Vector2dF(x_, y_); }
+  operator Vector2dF() const {
+    return Vector2dF(static_cast<float>(x()), static_cast<float>(y()));
+  }
 
  private:
   int x_;
   int y_;
 };
 
 inline bool operator==(const Vector2d& lhs, const Vector2d& rhs) {
   return lhs.x() == rhs.x() && lhs.y() == rhs.y();
 }
 
@@ skipping 14 matching lines @@
 }
 
 // This is declared here for use in gtest-based unit tests but is defined in
 // the gfx_test_support target. Depend on that to use this in your unit test.
 // This should not be used in production code - call ToString() instead.
 void PrintTo(const Vector2d& vector, ::std::ostream* os);
 
 }  // namespace gfx
 
 #endif // UI_GFX_GEOMETRY_VECTOR2D_H_