OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 UI_APP_LIST_VIEWS_CONTENTS_ANIMATOR_H_ | 5 #ifndef UI_APP_LIST_VIEWS_CONTENTS_ANIMATOR_H_ |
6 #define UI_APP_LIST_VIEWS_CONTENTS_ANIMATOR_H_ | 6 #define UI_APP_LIST_VIEWS_CONTENTS_ANIMATOR_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 }; | 74 }; |
75 | 75 |
76 // Simple animator that slides pages in and out vertically. Appropriate for any | 76 // Simple animator that slides pages in and out vertically. Appropriate for any |
77 // page pair. | 77 // page pair. |
78 class DefaultAnimator : public ContentsAnimator { | 78 class DefaultAnimator : public ContentsAnimator { |
79 public: | 79 public: |
80 explicit DefaultAnimator(ContentsView* contents_view); | 80 explicit DefaultAnimator(ContentsView* contents_view); |
81 | 81 |
82 ~DefaultAnimator() override {} | 82 ~DefaultAnimator() override {} |
83 | 83 |
| 84 using ContentsAnimator::GetOnscreenPageBounds; |
| 85 |
84 // ContentsAnimator overrides: | 86 // ContentsAnimator overrides: |
85 std::string NameForTests() const override; | 87 std::string NameForTests() const override; |
86 void Update(double progress, int from_page, int to_page) override; | 88 void Update(double progress, int from_page, int to_page) override; |
87 | 89 |
88 private: | 90 private: |
89 DISALLOW_COPY_AND_ASSIGN(DefaultAnimator); | 91 DISALLOW_COPY_AND_ASSIGN(DefaultAnimator); |
90 }; | 92 }; |
91 | 93 |
92 // Animator between the start page and apps grid page. | 94 // Animator between the start page and apps grid page. |
93 class StartToAppsAnimator : public ContentsAnimator { | 95 class StartToAppsAnimator : public ContentsAnimator { |
(...skipping 18 matching lines...) Expand all Loading... |
112 std::string NameForTests() const override; | 114 std::string NameForTests() const override; |
113 void Update(double progress, int start_page, int custom_page) override; | 115 void Update(double progress, int start_page, int custom_page) override; |
114 | 116 |
115 private: | 117 private: |
116 DISALLOW_COPY_AND_ASSIGN(StartToCustomAnimator); | 118 DISALLOW_COPY_AND_ASSIGN(StartToCustomAnimator); |
117 }; | 119 }; |
118 | 120 |
119 } // namespace app_list | 121 } // namespace app_list |
120 | 122 |
121 #endif // UI_APP_LIST_VIEWS_CONTENTS_ANIMATOR_H_ | 123 #endif // UI_APP_LIST_VIEWS_CONTENTS_ANIMATOR_H_ |
OLD | NEW |