| 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 ASH_SHELF_SHELF_VIEW_H_ | 5 #ifndef ASH_SHELF_SHELF_VIEW_H_ |
| 6 #define ASH_SHELF_SHELF_VIEW_H_ | 6 #define ASH_SHELF_SHELF_VIEW_H_ |
| 7 | 7 |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 // Invoked after the fading out animation for item deletion is ended. | 234 // Invoked after the fading out animation for item deletion is ended. |
| 235 void OnFadeOutAnimationEnded(); | 235 void OnFadeOutAnimationEnded(); |
| 236 | 236 |
| 237 // Fade in last visible item. | 237 // Fade in last visible item. |
| 238 void StartFadeInLastVisibleItem(); | 238 void StartFadeInLastVisibleItem(); |
| 239 | 239 |
| 240 // Updates the visible range of overflow items in |overflow_view|. | 240 // Updates the visible range of overflow items in |overflow_view|. |
| 241 void UpdateOverflowRange(ShelfView* overflow_view); | 241 void UpdateOverflowRange(ShelfView* overflow_view); |
| 242 | 242 |
| 243 // Overridden from views::View: | 243 // Overridden from views::View: |
| 244 virtual gfx::Size GetPreferredSize() OVERRIDE; | 244 virtual gfx::Size GetPreferredSize() const OVERRIDE; |
| 245 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; | 245 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; |
| 246 virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE; | 246 virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE; |
| 247 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; | 247 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; |
| 248 | 248 |
| 249 // Overridden from ui::EventHandler: | 249 // Overridden from ui::EventHandler: |
| 250 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; | 250 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; |
| 251 | 251 |
| 252 // Overridden from ShelfModelObserver: | 252 // Overridden from ShelfModelObserver: |
| 253 virtual void ShelfItemAdded(int model_index) OVERRIDE; | 253 virtual void ShelfItemAdded(int model_index) OVERRIDE; |
| 254 virtual void ShelfItemRemoved(int model_index, ShelfID id) OVERRIDE; | 254 virtual void ShelfItemRemoved(int model_index, ShelfID id) OVERRIDE; |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 | 433 |
| 434 // True when ripped item from overflow bubble is entered into Shelf. | 434 // True when ripped item from overflow bubble is entered into Shelf. |
| 435 bool dragged_off_from_overflow_to_shelf_; | 435 bool dragged_off_from_overflow_to_shelf_; |
| 436 | 436 |
| 437 DISALLOW_COPY_AND_ASSIGN(ShelfView); | 437 DISALLOW_COPY_AND_ASSIGN(ShelfView); |
| 438 }; | 438 }; |
| 439 | 439 |
| 440 } // namespace ash | 440 } // namespace ash |
| 441 | 441 |
| 442 #endif // ASH_SHELF_SHELF_VIEW_H_ | 442 #endif // ASH_SHELF_SHELF_VIEW_H_ |
| OLD | NEW |