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

Unified Diff: ash/launcher/launcher_button.h

Issue 11434099: Use the correct launcher assets for shelf alignment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
« no previous file with comments | « ash/launcher/launcher_alignment_menu.cc ('k') | ash/launcher/launcher_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_button.h
diff --git a/ash/launcher/launcher_button.h b/ash/launcher/launcher_button.h
index c46b20978d4d3692916053b5ce7492bf08b4cdfe..934fc9a19962dc3d46d5fe277d17e06ed9a450d2 100644
--- a/ash/launcher/launcher_button.h
+++ b/ash/launcher/launcher_button.h
@@ -13,6 +13,7 @@ namespace ash {
namespace internal {
class LauncherButtonHost;
+class ShelfLayoutManager;
// Button used for items on the launcher, except for the AppList.
class LauncherButton : public views::CustomButton {
@@ -38,7 +39,8 @@ class LauncherButton : public views::CustomButton {
// Called to create an instance of a LauncherButton.
static LauncherButton* Create(views::ButtonListener* listener,
- LauncherButtonHost* host);
+ LauncherButtonHost* host,
+ ShelfLayoutManager* shelf_layout_manager);
// Sets the image to display for this entry.
void SetImage(const gfx::ImageSkia& image);
@@ -52,7 +54,9 @@ class LauncherButton : public views::CustomButton {
gfx::Rect GetIconBounds() const;
protected:
- LauncherButton(views::ButtonListener* listener, LauncherButtonHost* host);
+ LauncherButton(views::ButtonListener* listener,
+ LauncherButtonHost* host,
+ ShelfLayoutManager* shelf_layout_manager);
// Class that draws the icon part of a button, so it can be animated
// independently of the rest. This can be subclassed to provide a custom
@@ -121,6 +125,8 @@ class LauncherButton : public views::CustomButton {
// together.
int state_;
+ ShelfLayoutManager* shelf_layout_manager_;
+
gfx::ShadowValues icon_shadows_;
DISALLOW_COPY_AND_ASSIGN(LauncherButton);
« no previous file with comments | « ash/launcher/launcher_alignment_menu.cc ('k') | ash/launcher/launcher_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698