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

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

Issue 45973003: ash: Rename LauncherIconObserver to ShelfIconObserver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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_icon_observer.h ('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 16 matching lines...) Expand all
27 } 27 }
28 28
29 namespace ash { 29 namespace ash {
30 30
31 namespace test { 31 namespace test {
32 class ShelfViewTestAPI; 32 class ShelfViewTestAPI;
33 } 33 }
34 34
35 class LauncherDelegate; 35 class LauncherDelegate;
36 struct LauncherItem; 36 struct LauncherItem;
37 class LauncherIconObserver;
38 class LauncherItemDelegateManager; 37 class LauncherItemDelegateManager;
39 class LauncherModel; 38 class LauncherModel;
39 class ShelfIconObserver;
40 40
41 namespace internal { 41 namespace internal {
42 42
43 class DragImageView; 43 class DragImageView;
44 class LauncherButton; 44 class LauncherButton;
45 class OverflowBubble; 45 class OverflowBubble;
46 class OverflowButton; 46 class OverflowButton;
47 class ShelfLayoutManager; 47 class ShelfLayoutManager;
48 class ShelfTooltipManager; 48 class ShelfTooltipManager;
49 49
(...skipping 22 matching lines...) Expand all
72 void OnShelfAlignmentChanged(); 72 void OnShelfAlignmentChanged();
73 void SchedulePaintForAllButtons(); 73 void SchedulePaintForAllButtons();
74 74
75 // Returns the ideal bounds of the specified item, or an empty rect if id 75 // Returns the ideal bounds of the specified item, or an empty rect if id
76 // isn't know. 76 // isn't know.
77 gfx::Rect GetIdealBoundsOfItemIcon(LauncherID id); 77 gfx::Rect GetIdealBoundsOfItemIcon(LauncherID id);
78 78
79 // Repositions the icon for the specified item by the midpoint of the window. 79 // Repositions the icon for the specified item by the midpoint of the window.
80 void UpdatePanelIconPosition(LauncherID id, const gfx::Point& midpoint); 80 void UpdatePanelIconPosition(LauncherID id, const gfx::Point& midpoint);
81 81
82 void AddIconObserver(LauncherIconObserver* observer); 82 void AddIconObserver(ShelfIconObserver* observer);
83 void RemoveIconObserver(LauncherIconObserver* observer); 83 void RemoveIconObserver(ShelfIconObserver* observer);
84 84
85 // Returns true if we're showing a menu. 85 // Returns true if we're showing a menu.
86 bool IsShowingMenu() const; 86 bool IsShowingMenu() const;
87 87
88 // Returns true if overflow bubble is shown. 88 // Returns true if overflow bubble is shown.
89 bool IsShowingOverflowBubble() const; 89 bool IsShowingOverflowBubble() const;
90 90
91 // Sets owner overflow bubble instance from which this shelf view pops 91 // Sets owner overflow bubble instance from which this shelf view pops
92 // out as overflow. 92 // out as overflow.
93 void set_owner_overflow_bubble(OverflowBubble* owner) { 93 void set_owner_overflow_bubble(OverflowBubble* owner) {
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 // Index |drag_view_| was initially at. 349 // Index |drag_view_| was initially at.
350 int start_drag_index_; 350 int start_drag_index_;
351 351
352 // Used for the context menu of a particular item. 352 // Used for the context menu of a particular item.
353 LauncherID context_menu_id_; 353 LauncherID context_menu_id_;
354 354
355 scoped_ptr<views::FocusSearch> focus_search_; 355 scoped_ptr<views::FocusSearch> focus_search_;
356 356
357 scoped_ptr<views::MenuRunner> launcher_menu_runner_; 357 scoped_ptr<views::MenuRunner> launcher_menu_runner_;
358 358
359 ObserverList<LauncherIconObserver> observers_; 359 ObserverList<ShelfIconObserver> observers_;
360 360
361 // Amount content is inset on the left edge (or top edge for vertical 361 // Amount content is inset on the left edge (or top edge for vertical
362 // alignment). 362 // alignment).
363 int leading_inset_; 363 int leading_inset_;
364 364
365 ShelfGestureHandler gesture_handler_; 365 ShelfGestureHandler gesture_handler_;
366 366
367 // True when an item being inserted or removed in the model cancels a drag. 367 // True when an item being inserted or removed in the model cancels a drag.
368 bool cancelling_drag_model_changed_; 368 bool cancelling_drag_model_changed_;
369 369
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 // Holds ShelfLayoutManager. 414 // Holds ShelfLayoutManager.
415 ShelfLayoutManager* layout_manager_; 415 ShelfLayoutManager* layout_manager_;
416 416
417 DISALLOW_COPY_AND_ASSIGN(ShelfView); 417 DISALLOW_COPY_AND_ASSIGN(ShelfView);
418 }; 418 };
419 419
420 } // namespace internal 420 } // namespace internal
421 } // namespace ash 421 } // namespace ash
422 422
423 #endif // ASH_SHELF_SHELF_VIEW_H_ 423 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_icon_observer.h ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698