Preliminary cleanup of ShelfButton activity/status indicator.

ash/common/shelf/shelf_button.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_COMMON_SHELF_SHELF_BUTTON_H_
 #define ASH_COMMON_SHELF_SHELF_BUTTON_H_
 
 #include "ash/ash_export.h"
 #include "base/macros.h"
 #include "ui/gfx/shadow_value.h"
@@ skipping 76 matching lines @@
   // views::CustomButton overrides:
   std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override;
   bool ShouldEnterPushedState(const ui::Event& event) override;
   std::unique_ptr<views::InkDrop> CreateInkDrop() override;
   void NotifyClick(const ui::Event& event) override;
 
   // Sets the icon image with a shadow.
   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.
   ShelfView* shelf_view_;
 
   // 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_;
 
   gfx::ShadowValues icon_shadows_;
 
   // If non-null the destuctor sets this to true. This is set while the menu is
   // showing and used to detect if the menu was deleted while running.
   bool* destroyed_flag_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfButton);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SHELF_SHELF_BUTTON_H_