Ash:Shelf - Cleanup of Alternate Shelf (part 1)

ash/shelf/app_list_button.h

Index: ash/shelf/app_list_button.h
diff --git a/ash/shelf/app_list_button.h b/ash/shelf/app_list_button.h
index 9b013de7e88d667ec9e1568e260ef46921a8d43f..89d58fe2989e37f8ef247aa0dec2edd0645e6bfe 100644
--- a/ash/shelf/app_list_button.h
+++ b/ash/shelf/app_list_button.h
@@ -8,6 +8,9 @@
 #include "ui/views/controls/button/image_button.h"
 
 namespace ash {
+
+class ShelfWidget;
+
 namespace internal {
 
 class ShelfButtonHost;
@@ -15,14 +18,16 @@ class ShelfButtonHost;
 // Button used for the AppList icon on the shelf.
 class AppListButton : public views::ImageButton {

[James Cook, 2014/01/23 18:02:35]

It looks like you deleted the old app_list_button.h and then renamed
alternate_app_list_button.h to app_list_button.h.  Unfortunately git and
reitveld don't understand that; they think you just modified app_list_button.h.
This will lose revision history.

It's up to you how to resolve this. I think there are two approaches:
* Just decide the revision history of alternate_app_list_button.h/cc isn't
important and do what you do here
* Break this CL into two patches. In the first one delete app_list_button.h/cc. 
In the second one rename alternate_app_list_button.h/cc to app_list_button.h/cc.

What do you think?

[Harry McCleave, 2014/01/24 22:48:47]

This is the case, I don't think there is any meaningful history in the
alternate_ files as they have only existed for 1 or 2 changes, so I would vote
for just letting those changes get compressed into this one in the history, if
you disagree I will split this into 2 changes (rm app_list_button, then mv).

[James Cook, 2014/01/25 00:12:14]

In that case, keep it in one change. I just wanted to check that we weren't
losing anything significant.

  public:
-  AppListButton(views::ButtonListener* listener, ShelfButtonHost* host);
-  virtual ~AppListButton();
+  // Bounds size (inset) required for the app icon image (in pixels).
+  static const int kImageBoundsSize;
 
-  void StartLoadingAnimation();
-  void StopLoadingAnimation();
+  AppListButton(views::ButtonListener* listener,
+                ShelfButtonHost* host,
+                ShelfWidget* shelf_widget);
+  virtual ~AppListButton();
 
  protected:
-  // views::ImageButton:
+  // views::ImageButton overrides:
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseCaptureLost() OVERRIDE;
@@ -30,10 +35,17 @@ class AppListButton : public views::ImageButton {
   virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
+  // ui::EventHandler overrides:
+  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+
  private:
   ShelfButtonHost* host_;
+  // Reference to the shelf widget containing this button, owned by the
+  // root window controller.
+  ShelfWidget* shelf_widget_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListButton);
 };