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

Unified Diff: cc/input/top_controls_manager.cc

Issue 986433004: Revert of Always create top controls manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « cc/base/switches.cc ('k') | cc/input/top_controls_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/input/top_controls_manager.cc
diff --git a/cc/input/top_controls_manager.cc b/cc/input/top_controls_manager.cc
index c8bd5348721ca72c007c38ada13b9dd650b536f8..7362805de99acba4c5caa3145f9f268df1778336 100644
--- a/cc/input/top_controls_manager.cc
+++ b/cc/input/top_controls_manager.cc
@@ -101,9 +101,6 @@
gfx::Vector2dF TopControlsManager::ScrollBy(
const gfx::Vector2dF& pending_delta) {
- if (!TopControlsHeight())
- return pending_delta;
-
if (pinch_gesture_active_)
return pending_delta;
@@ -182,12 +179,6 @@
if (top_controls_animation_ && animation_direction_ == direction)
return;
-
- if (!TopControlsHeight()) {
- client_->SetCurrentTopControlsShownRatio(
- direction == HIDING_CONTROLS ? 0.f : 1.f);
- return;
- }
top_controls_animation_ = KeyframedFloatAnimationCurve::Create();
base::TimeDelta start_time = gfx::FrameTime::Now() - base::TimeTicks();
« no previous file with comments | « cc/base/switches.cc ('k') | cc/input/top_controls_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698