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

Side by Side Diff: ash/launcher/launcher_view.h

Issue 10701051: Polish launcher tooltip visibility (2nd try). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 5 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/launcher/launcher_tooltip_manager_unittest.cc ('k') | ash/launcher/launcher_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_LAUNCHER_LAUNCHER_VIEW_H_ 5 #ifndef ASH_LAUNCHER_LAUNCHER_VIEW_H_
6 #define ASH_LAUNCHER_LAUNCHER_VIEW_H_ 6 #define ASH_LAUNCHER_LAUNCHER_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 23 matching lines...) Expand all
34 34
35 class LauncherDelegate; 35 class LauncherDelegate;
36 struct LauncherItem; 36 struct LauncherItem;
37 class LauncherIconObserver; 37 class LauncherIconObserver;
38 class LauncherModel; 38 class LauncherModel;
39 39
40 namespace internal { 40 namespace internal {
41 41
42 class LauncherButton; 42 class LauncherButton;
43 class LauncherTooltipManager; 43 class LauncherTooltipManager;
44 class ShelfLayoutManager;
44 45
45 class ASH_EXPORT LauncherView : public views::View, 46 class ASH_EXPORT LauncherView : public views::View,
46 public LauncherModelObserver, 47 public LauncherModelObserver,
47 public views::ButtonListener, 48 public views::ButtonListener,
48 public LauncherButtonHost, 49 public LauncherButtonHost,
49 public views::ContextMenuController, 50 public views::ContextMenuController,
50 public views::FocusTraversable, 51 public views::FocusTraversable,
51 public views::BoundsAnimatorObserver { 52 public views::BoundsAnimatorObserver {
52 public: 53 public:
53 LauncherView(LauncherModel* model, LauncherDelegate* delegate); 54 LauncherView(LauncherModel* model,
55 LauncherDelegate* delegate,
56 ShelfLayoutManager* shelf_layout_manager);
54 virtual ~LauncherView(); 57 virtual ~LauncherView();
55 58
56 LauncherTooltipManager* tooltip_manager() { return tooltip_.get(); } 59 LauncherTooltipManager* tooltip_manager() { return tooltip_.get(); }
57 60
58 void Init(); 61 void Init();
59 62
60 void SetAlignment(ShelfAlignment alignment); 63 void SetAlignment(ShelfAlignment alignment);
61 64
62 // Returns the ideal bounds of the specified item, or an empty rect if id 65 // Returns the ideal bounds of the specified item, or an empty rect if id
63 // isn't know. 66 // isn't know.
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 245
243 ShelfAlignment alignment_; 246 ShelfAlignment alignment_;
244 247
245 DISALLOW_COPY_AND_ASSIGN(LauncherView); 248 DISALLOW_COPY_AND_ASSIGN(LauncherView);
246 }; 249 };
247 250
248 } // namespace internal 251 } // namespace internal
249 } // namespace ash 252 } // namespace ash
250 253
251 #endif // ASH_LAUNCHER_LAUNCHER_VIEW_H_ 254 #endif // ASH_LAUNCHER_LAUNCHER_VIEW_H_
OLDNEW
« no previous file with comments | « ash/launcher/launcher_tooltip_manager_unittest.cc ('k') | ash/launcher/launcher_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698