Preliminary cleanup of ShelfButton activity/status indicator.

ash/common/shelf/shelf_button.h

Index: ash/common/shelf/shelf_button.h
diff --git a/ash/common/shelf/shelf_button.h b/ash/common/shelf/shelf_button.h
index 8e2bc3d4910ffb7958642bc00bce02cafeba6a38..4f828ea182e82010bffef022d7c3c08088e1a6b7 100644
--- a/ash/common/shelf/shelf_button.h
+++ b/ash/common/shelf/shelf_button.h
@@ -94,15 +94,12 @@ class ASH_EXPORT ShelfButton : public views::CustomButton {
   void SetShadowedImage(const gfx::ImageSkia& bitmap);
 
  private:
-  class BarView;
+  class AppStatusIndicatorView;
 
   // Updates the parts of the button to reflect the current |state_| and
   // alignment. This may add or remove views, layout and paint.
   void UpdateState();
 
-  // Updates the status bar (bitmap, orientation, visibility).
-  void UpdateBar();
-
   InkDropButtonListener* listener_;
 
   // The shelf view hosting this button.
@@ -111,8 +108,9 @@ class ASH_EXPORT ShelfButton : public views::CustomButton {
   // The icon part of a button can be animated independently of the rest.
   views::ImageView* icon_view_;
 
-  // Draws a bar underneath the image to represent the state of the application.
-  BarView* bar_;
+  // Draws an indicator underneath the image to represent the state of the
+  // application.
+  AppStatusIndicatorView* indicator_;
 
   // The current application state, a bitfield of State enum values.
   int state_;