Type conversion fixes, ui/ edition.

chrome/browser/ui/views/ash/tab_scrubber_browsertest.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/ash/tab_scrubber.h"
 
 #include "ash/display/event_transformation_handler.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 46 matching lines @@
 
   virtual void TearDownOnMainThread() override {
     browser()->tab_strip_model()->RemoveObserver(this);
   }
 
   TabStrip* GetTabStrip(Browser* browser) {
     aura::Window* window = browser->window()->GetNativeWindow();
     return BrowserView::GetBrowserViewForNativeWindow(window)->tabstrip();
   }
 
-  int GetStartX(Browser* browser,
-                int index,
-                TabScrubber::Direction direction) {
-    return TabScrubber::GetStartPoint(
-        GetTabStrip(browser), index, direction).x();
+  float GetStartX(Browser* browser,
+                  int index,
+                  TabScrubber::Direction direction) {
+    return static_cast<float>(TabScrubber::GetStartPoint(
+        GetTabStrip(browser), index, direction).x());
   }
 
-  int GetTabCenter(Browser* browser, int index) {
-    return GetTabStrip(browser)->tab_at(index)->bounds().CenterPoint().x();
+  float GetTabCenter(Browser* browser, int index) {
+    return static_cast<float>(
+        GetTabStrip(browser)->tab_at(index)->bounds().CenterPoint().x());
   }
 
   // Sends one scroll event synchronously without initial or final
   // fling events.
   void SendScrubEvent(Browser* browser, int index) {
     aura::Window* window = browser->window()->GetNativeWindow();
     aura::Window* root = window->GetRootWindow();
     ui::test::EventGenerator event_generator(root, window);
     int active_index = browser->tab_strip_model()->active_index();
     TabScrubber::Direction direction = index < active_index ?
         TabScrubber::LEFT : TabScrubber::RIGHT;
-    int offset = GetTabCenter(browser, index) -
+    float offset = GetTabCenter(browser, index) -
         GetStartX(browser, active_index, direction);
     ui::ScrollEvent scroll_event(ui::ET_SCROLL,
-                                 gfx::Point(0, 0),
+                                 gfx::PointF(0, 0),
                                  ui::EventTimeForNow(),
                                  0,
                                  offset, 0,
                                  offset, 0,
                                  3);
     event_generator.Dispatch(&scroll_event);
   }
 
   enum ScrubType {
     EACH_TAB,
@@ skipping 16 matching lines @@
     int increment;
     if (index < active_index) {
       direction = TabScrubber::LEFT;
       increment = -1;
     } else {
       direction = TabScrubber::RIGHT;
       increment = 1;
     }
     if (scrub_type == SKIP_TABS)
       increment *= 2;
-    int last = GetStartX(browser, active_index, direction);
-    std::vector<gfx::Point> offsets;
+    float last = GetStartX(browser, active_index, direction);
+    std::vector<gfx::PointF> offsets;
     for (int i = active_index + increment; i != (index + increment);
-        i += increment) {
-      int tab_center = GetTabCenter(browser, i);
-      offsets.push_back(gfx::Point(tab_center - last, 0));
+         i += increment) {
+      float tab_center = GetTabCenter(browser, i);
+      offsets.push_back(gfx::PointF(tab_center - last, 0));
       last = GetStartX(browser, i, direction);
       if (scrub_type == REPEAT_TABS) {
-        offsets.push_back(gfx::Point(increment, 0));
+        offsets.push_back(gfx::PointF(static_cast<float>(increment), 0));
         last += increment;
       }
     }
     event_generator.ScrollSequence(gfx::Point(0, 0),
                                    base::TimeDelta::FromMilliseconds(100),
                                    offsets,
                                    3);
     RunUntilTabActive(browser, index);
   }
 
   // Sends events and waits for tab at |index| to become active
   // if it's different from the currently active tab.
   // If the active tab is expected to stay the same, send events
   // synchronously (as we don't have anything to wait for).
-  void SendScrubSequence(Browser* browser, int x_offset, int index) {
+  void SendScrubSequence(Browser* browser, float x_offset, int index) {
     aura::Window* window = browser->window()->GetNativeWindow();
     aura::Window* root = window->GetRootWindow();
     ui::test::EventGenerator event_generator(root, window);
     bool wait_for_active = false;
     if (index != browser->tab_strip_model()->active_index()) {
       wait_for_active = true;
       event_generator.set_async(true);
     }
     event_generator.ScrollSequence(gfx::Point(0, 0),
                                    ui::EventTimeForNow(),
@@ skipping 253 matching lines @@
 IN_PROC_BROWSER_TEST_F(TabScrubberTest, CloseBrowser) {
   AddTabs(browser(), 1);
 
   SendScrubEvent(browser(), 0);
   EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending());
   browser()->window()->Close();
   EXPECT_FALSE(TabScrubber::GetInstance()->IsActivationPending());
 }
 
 #endif  // defined(OS_CHROMEOS)