Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2334)

Unified Diff: athena/content/web_activity.cc

Issue 645223003: Change overscroll functions to pass floats. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/browser.h » ('j') | content/browser/web_contents/web_contents_view_aura.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/content/web_activity.cc
diff --git a/athena/content/web_activity.cc b/athena/content/web_activity.cc
index be9ad2f705132dc3f235fdd17f141f81a0a68d2e..0324e8c87ba33859e0a84aae54a8d49d682bb34b 100644
--- a/athena/content/web_activity.cc
+++ b/athena/content/web_activity.cc
@@ -155,8 +155,8 @@ class WebActivityController : public AcceleratorHandler {
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
@@ -267,7 +267,7 @@ class AthenaWebView : public views::WebView {
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_)
@@ -275,9 +275,8 @@ class AthenaWebView : public views::WebView {
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_) {
@@ -412,7 +411,7 @@ class AthenaWebView : public views::WebView {
bool fullscreen_;
// The distance that the user has overscrolled vertically.
- int overscroll_y_;
+ float overscroll_y_;
DISALLOW_COPY_AND_ASSIGN(AthenaWebView);
};
« no previous file with comments | « no previous file | chrome/browser/ui/browser.h » ('j') | content/browser/web_contents/web_contents_view_aura.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698