Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: ash/shelf/shelf_view.h

Issue 140323010: Ash:Shelf - Cleanup of Alternate Shelf (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/shelf/shelf_navigator_unittest.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 // returns bounds from first item to last panel item. 228 // returns bounds from first item to last panel item.
229 // * In the overflow mode, returns only bubble's bounds. 229 // * In the overflow mode, returns only bubble's bounds.
230 gfx::Rect GetBoundsForDragInsertInScreen(); 230 gfx::Rect GetBoundsForDragInsertInScreen();
231 231
232 // Common setup done for all children. 232 // Common setup done for all children.
233 void ConfigureChildView(views::View* view); 233 void ConfigureChildView(views::View* view);
234 234
235 // Toggles the overflow menu. 235 // Toggles the overflow menu.
236 void ToggleOverflowBubble(); 236 void ToggleOverflowBubble();
237 237
238 // Update first launcher button's padding. This method adds padding to the
239 // first button to include the leading inset. It needs to be called once on
240 // button creation and every time when shelf alignment is changed.
241 void UpdateFirstButtonPadding();
242
243 // Invoked after the fading out animation for item deletion is ended. 238 // Invoked after the fading out animation for item deletion is ended.
244 void OnFadeOutAnimationEnded(); 239 void OnFadeOutAnimationEnded();
245 240
246 // Fade in last visible item. 241 // Fade in last visible item.
247 void StartFadeInLastVisibleItem(); 242 void StartFadeInLastVisibleItem();
248 243
249 // Updates the visible range of overflow items in |overflow_view|. 244 // Updates the visible range of overflow items in |overflow_view|.
250 void UpdateOverflowRange(ShelfView* overflow_view); 245 void UpdateOverflowRange(ShelfView* overflow_view);
251 246
252 // Returns the launcher button size.
253 int GetButtonSize() const;
254
255 // Returns the button spacing.
256 int GetButtonSpacing() const;
257
258 // Overridden from views::View: 247 // Overridden from views::View:
259 virtual gfx::Size GetPreferredSize() OVERRIDE; 248 virtual gfx::Size GetPreferredSize() OVERRIDE;
260 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; 249 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
261 virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE; 250 virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE;
262 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; 251 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
263 252
264 // Overridden from ui::EventHandler: 253 // Overridden from ui::EventHandler:
265 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 254 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
266 255
267 // Overridden from ShelfModelObserver: 256 // Overridden from ShelfModelObserver:
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 // True when ripped item from overflow bubble is entered into Shelf. 438 // True when ripped item from overflow bubble is entered into Shelf.
450 bool dragged_off_from_overflow_to_shelf_; 439 bool dragged_off_from_overflow_to_shelf_;
451 440
452 DISALLOW_COPY_AND_ASSIGN(ShelfView); 441 DISALLOW_COPY_AND_ASSIGN(ShelfView);
453 }; 442 };
454 443
455 } // namespace internal 444 } // namespace internal
456 } // namespace ash 445 } // namespace ash
457 446
458 #endif // ASH_SHELF_SHELF_VIEW_H_ 447 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_navigator_unittest.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698