| Index: content/browser/android/overscroll_glow.h
 | 
| diff --git a/content/browser/android/overscroll_glow.h b/content/browser/android/overscroll_glow.h
 | 
| index 8fae95c4b86704939d5e9d72fe8996f9ab6ef1dc..7ebb8171e8640ac640b57b54a56a80aabf4c6abf 100644
 | 
| --- a/content/browser/android/overscroll_glow.h
 | 
| +++ b/content/browser/android/overscroll_glow.h
 | 
| @@ -45,6 +45,7 @@ class OverscrollGlow {
 | 
|    // Called when the root content layer overscrolls.
 | 
|    // |accumulated_overscroll| and |overscroll_delta| are in device pixels, while
 | 
|    // |velocity| is in device pixels / second.
 | 
| +  // |overscroll_location| is the coordinate of the causal overscrolling event.
 | 
|    // Returns true if the effect still needs animation ticks.
 | 
|    bool OnOverscrolled(base::TimeTicks current_time,
 | 
|                        const gfx::Vector2dF& accumulated_overscroll,
 | 
| @@ -98,6 +99,8 @@ class OverscrollGlow {
 | 
|    gfx::SizeF viewport_size_;
 | 
|    float edge_offsets_[EDGE_COUNT];
 | 
|    bool initialized_;
 | 
| +  bool allow_horizontal_overscroll_;
 | 
| +  bool allow_vertical_overscroll_;
 | 
|  
 | 
|    scoped_refptr<cc::Layer> root_layer_;
 | 
|  
 | 
| 
 |