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

Unified Diff: ash/launcher/launcher_tooltip_manager.h

Issue 11434099: Use the correct launcher assets for shelf alignment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clean up Created 8 years 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 side-by-side diff with in-line comments
Download patch
Index: ash/launcher/launcher_tooltip_manager.h
diff --git a/ash/launcher/launcher_tooltip_manager.h b/ash/launcher/launcher_tooltip_manager.h
index ee3395f5322a3664d8d24043c95dabc04ef5cb6c..428e7ab7173a6454db25000c48c7cee627c4a8f9 100644
--- a/ash/launcher/launcher_tooltip_manager.h
+++ b/ash/launcher/launcher_tooltip_manager.h
@@ -40,11 +40,14 @@ class ASH_EXPORT LauncherTooltipManager : public ui::EventHandler,
public ShelfLayoutManager::Observer,
public SessionStateObserver {
public:
- LauncherTooltipManager(ShelfAlignment alignment,
- ShelfLayoutManager* shelf_layout_manager,
+ LauncherTooltipManager(ShelfLayoutManager* shelf_layout_manager,
LauncherView* launcher_view);
virtual ~LauncherTooltipManager();
+ ShelfLayoutManager* shelf_layout_manager() {
+ return shelf_layout_manager_;
+ }
+
// Called when the bubble is closed.
void OnBubbleClosed(views::BubbleDelegateView* view);
@@ -59,7 +62,7 @@ class ASH_EXPORT LauncherTooltipManager : public ui::EventHandler,
// Changes the arrow location of the tooltip in case that the launcher
// arrangement has changed.
- void SetArrowLocation(ShelfAlignment alignment);
+ void UpdateArrowLocation();
// Resets the timer for the delayed showing |view_|. If the timer isn't
// running, it starts a new timer.
@@ -102,7 +105,6 @@ protected:
views::Widget* widget_;
views::View* anchor_;
string16 text_;
- ShelfAlignment alignment_;
scoped_ptr<base::Timer> timer_;
ShelfLayoutManager* shelf_layout_manager_;

Powered by Google App Engine
This is Rietveld 408576698