| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_WINDOW_ANIMATION_H_ | 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_WINDOW_ANIMATION_H_ |
| 6 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_WINDOW_ANIMATION_H_ | 6 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_WINDOW_ANIMATION_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" |
| 8 #include "content/browser/renderer_host/overscroll_controller_delegate.h" | 9 #include "content/browser/renderer_host/overscroll_controller_delegate.h" |
| 9 #include "content/common/content_export.h" | 10 #include "content/common/content_export.h" |
| 10 #include "ui/compositor/layer_animation_observer.h" | 11 #include "ui/compositor/layer_animation_observer.h" |
| 11 | 12 |
| 12 namespace aura { | 13 namespace aura { |
| 13 class Window; | 14 class Window; |
| 14 } | 15 } |
| 15 | 16 |
| 16 namespace ui { | 17 namespace ui { |
| 17 class Layer; | 18 class Layer; |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 // Indicates if the current slide has been cancelled. True while the cancel | 121 // Indicates if the current slide has been cancelled. True while the cancel |
| 121 // animation is in progress. | 122 // animation is in progress. |
| 122 bool overscroll_cancelled_; | 123 bool overscroll_cancelled_; |
| 123 | 124 |
| 124 DISALLOW_COPY_AND_ASSIGN(OverscrollWindowAnimation); | 125 DISALLOW_COPY_AND_ASSIGN(OverscrollWindowAnimation); |
| 125 }; | 126 }; |
| 126 | 127 |
| 127 } // namespace content | 128 } // namespace content |
| 128 | 129 |
| 129 #endif // CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_WINDOW_ANIMATION_H_ | 130 #endif // CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_WINDOW_ANIMATION_H_ |
| OLD | NEW |