| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_VIEW_H_ | 5 #ifndef UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ |
| 6 #define UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ | 6 #define UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 // on-screen or off-screen). | 141 // on-screen or off-screen). |
| 142 gfx::Rect GetCustomPageCollapsedBounds() const; | 142 gfx::Rect GetCustomPageCollapsedBounds() const; |
| 143 | 143 |
| 144 // Exposes GetAnimatorForTransition for tests. | 144 // Exposes GetAnimatorForTransition for tests. |
| 145 ContentsAnimator* GetAnimatorForTransitionForTests(int from_page, | 145 ContentsAnimator* GetAnimatorForTransitionForTests(int from_page, |
| 146 int to_page, | 146 int to_page, |
| 147 bool* reverse) const { | 147 bool* reverse) const { |
| 148 return GetAnimatorForTransition(from_page, to_page, reverse); | 148 return GetAnimatorForTransition(from_page, to_page, reverse); |
| 149 } | 149 } |
| 150 | 150 |
| 151 // Determines whether the custom page clickzone widget should be displayed. | |
| 152 bool ShouldShowCustomPageClickzone() const; | |
| 153 | |
| 154 // Performs the 'back' action for the active page. Returns whether the action | 151 // Performs the 'back' action for the active page. Returns whether the action |
| 155 // was handled. | 152 // was handled. |
| 156 bool Back(); | 153 bool Back(); |
| 157 | 154 |
| 158 // Overridden from views::View: | 155 // Overridden from views::View: |
| 159 gfx::Size GetPreferredSize() const override; | 156 gfx::Size GetPreferredSize() const override; |
| 160 void Layout() override; | 157 void Layout() override; |
| 161 bool OnKeyPressed(const ui::KeyEvent& event) override; | 158 bool OnKeyPressed(const ui::KeyEvent& event) override; |
| 162 | 159 |
| 163 // Overridden from PaginationModelObserver: | 160 // Overridden from PaginationModelObserver: |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 | 246 |
| 250 // The animator for transitions not found in |contents_animators_|. | 247 // The animator for transitions not found in |contents_animators_|. |
| 251 scoped_ptr<ContentsAnimator> default_animator_; | 248 scoped_ptr<ContentsAnimator> default_animator_; |
| 252 | 249 |
| 253 DISALLOW_COPY_AND_ASSIGN(ContentsView); | 250 DISALLOW_COPY_AND_ASSIGN(ContentsView); |
| 254 }; | 251 }; |
| 255 | 252 |
| 256 } // namespace app_list | 253 } // namespace app_list |
| 257 | 254 |
| 258 #endif // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ | 255 #endif // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ |
| OLD | NEW |