Change overscroll functions to pass floats.

athena/content/web_activity.cc

 // Copyright 2014 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 "athena/content/web_activity.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/content_proxy.h"
 #include "athena/content/media_utils.h"
@@ skipping 137 matching lines @@
   views::WebView* web_view_;
   bool reserved_accelerator_enabled_;
   scoped_ptr<AcceleratorManager> accelerator_manager_;
   views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(WebActivityController);
 };
 
 const SkColor kDefaultTitleColor = SkColorSetRGB(0xf2, 0xf2, 0xf2);
 const int kIconSize = 32;
-const int kDistanceShowReloadMessage = 100;
-const int kDistanceReload = 150;
+const float kDistanceShowReloadMessage = 100;
+const float kDistanceReload = 150;
 
 }  // namespace
 
 // A web view for athena's web activity. Note that AthenaWebView will create its
 // own content so that it can eject and reload it.
 class AthenaWebView : public views::WebView {
  public:
   explicit AthenaWebView(content::BrowserContext* context)
       : views::WebView(context),
         controller_(new WebActivityController(this)),
@@ skipping 90 matching lines @@
     // NULL is returned if the URL wasn't opened immediately.
     return NULL;
   }
 
   virtual bool CanOverscrollContent() const override {
     const std::string value = CommandLine::ForCurrentProcess()->
         GetSwitchValueASCII(switches::kOverscrollHistoryNavigation);
     return value != "0";
   }
 
-  virtual void OverscrollUpdate(int delta_y) override {
+  virtual void OverscrollUpdate(float delta_y) override {
     overscroll_y_ = delta_y;
     if (overscroll_y_ > kDistanceShowReloadMessage) {
       if (!reload_message_)
         CreateReloadMessage();
       reload_message_->Show();
       float opacity = 1.0f;
       if (overscroll_y_ < kDistanceReload) {
-        opacity =
-            (overscroll_y_ - kDistanceShowReloadMessage) /
-            static_cast<float>(kDistanceReload - kDistanceShowReloadMessage);
+        opacity = (overscroll_y_ - kDistanceShowReloadMessage) /
+            (kDistanceReload - kDistanceShowReloadMessage);
       }
       reload_message_->GetLayer()->SetOpacity(opacity);
     } else if (reload_message_) {
       reload_message_->Hide();
     }
   }
 
   virtual void OverscrollComplete() override {
     if (overscroll_y_ >= kDistanceReload)
       GetWebContents()->GetController().Reload(false);
@@ skipping 114 matching lines @@
 
   scoped_ptr<ui::Layer> progress_bar_;
 
   scoped_ptr<views::Widget> reload_message_;
 
   // TODO(oshima): Find out if we should support window fullscreen.
   // It may still useful when a user is in split mode.
   bool fullscreen_;
 
   // The distance that the user has overscrolled vertically.
-  int overscroll_y_;
+  float overscroll_y_;
 
   DISALLOW_COPY_AND_ASSIGN(AthenaWebView);
 };
 
 WebActivity::WebActivity(content::BrowserContext* browser_context,
                          const base::string16& title,
                          const GURL& url)
     : browser_context_(browser_context),
       web_view_(new AthenaWebView(browser_context)),
       title_(title),
@@ skipping 199 matching lines @@
   if (content_proxy_.get())
     content_proxy_.reset(NULL);
 }
 
 void WebActivity::ShowContentProxy() {
   if (!content_proxy_.get())
     content_proxy_.reset(new ContentProxy(web_view_));
 }
 
 }  // namespace athena