Update activity indicator from a light bar to a point

ash/shelf/shelf_button.cc

 // 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.
 
 #include "ash/shelf/shelf_button.h"
 
 #include <algorithm>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
@@ skipping 19 matching lines @@
 namespace {
 
 // Size of the bar. This is along the opposite axis of the shelf. For example,
 // if the shelf is aligned horizontally then this is the height of the bar.
 const int kBarSize = 3;
 const int kIconSize = 32;
 const int kIconPad = 5;
 const int kIconPadVertical = 6;
 const int kAttentionThrobDurationMS = 800;
 const int kMaxAnimationSeconds = 10;
+const int kShelfIconHeight = 48;
+const int kShelfIconWidth = 48;
+const int kBarPadVertical = 3;
+const int kBarRadius = 2;
 
 // Simple AnimationDelegate that owns a single ThrobAnimation instance to
 // keep all Draw Attention animations in sync.
 class ShelfButtonAnimation : public gfx::AnimationDelegate {
  public:
   class Observer {
    public:
     virtual void AnimationProgressed() = 0;
 
    protected:
@@ skipping 429 matching lines @@
   int bar_id = 0;
   if (state_ & (STATE_ACTIVE))
     bar_id = IDR_ASH_SHELF_UNDERLINE_ACTIVE;
   else if (state_ & STATE_ATTENTION)
     bar_id = IDR_ASH_SHELF_UNDERLINE_ATTENTION;
   else if (state_ & STATE_RUNNING)
     bar_id = IDR_ASH_SHELF_UNDERLINE_RUNNING;
 
   if (bar_id != 0) {
     Shelf* shelf = shelf_view_->shelf();
-    ResourceBundle* rb = &ResourceBundle::GetSharedInstance();
-    gfx::ImageSkia image = *rb->GetImageNamed(bar_id).ToImageSkia();
+    //    ResourceBundle* rb = &ResourceBundle::GetSharedInstance();

[varkha, 2016/04/28 16:49:03]

nit: You probably want to remove this before landing (no commented code or LOG
statements in the commits).

[yiyix, 2016/05/02 15:55:04]

I keep these lines, so it is easier to add the ash-md flag.

+    //    gfx::ImageSkia image = *rb->GetImageNamed(bar_id).ToImageSkia();

[bruthig, 2016/04/27 18:56:00]

FYI You will need to 'hide' this feature behind the experimental flag that
varkha@ is adding here: https://codereview.chromium.org/1921133002/

[yiyix, 2016/05/02 15:55:03]

Done.

+    gfx::Canvas canvas(gfx::Size(kShelfIconHeight, kShelfIconWidth),
+                       kShelfIconHeight, true /* is_opaque */);
+    GetActivityIndicatorImage(canvas);
+    gfx::ImageSkia image = gfx::ImageSkia(canvas.ExtractImageRep());
     if (!shelf->IsHorizontalAlignment()) {
       image = gfx::ImageSkiaOperations::CreateRotatedImage(
           image, shelf->alignment() == SHELF_ALIGNMENT_LEFT
                      ? SkBitmapOperations::ROTATION_90_CW
                      : SkBitmapOperations::ROTATION_270_CW);
     }
     bar_->SetImage(image);
     bar_->SetHorizontalAlignment(shelf->SelectValueForShelfAlignment(
         views::ImageView::CENTER, views::ImageView::LEADING,
         views::ImageView::TRAILING));
     bar_->SetVerticalAlignment(shelf->SelectValueForShelfAlignment(
         views::ImageView::TRAILING, views::ImageView::CENTER,
         views::ImageView::CENTER));
     bar_->SchedulePaint();
   }
-
   bar_->SetVisible(bar_id != 0 && state_ != STATE_NORMAL);
 }
 
+void ShelfButton::GetActivityIndicatorImage(gfx::Canvas& canvas) {
+  SkCanvas* skcanvas = canvas.sk_canvas();
+  SkPaint paint;

[bruthig, 2016/04/27 18:56:00]

Make sure to #include everything you use.  i.e. SkPaint.

[yiyix, 2016/05/02 15:55:04]

Done.

+  paint.setColor(SK_ColorWHITE);

[bruthig, 2016/04/27 18:56:00]

nit: Assign SK_ColorWHITE to a constant above and use the constant here.
Ditto for the 'magic' radius value of 2 below.

[yiyix, 2016/05/02 15:55:03]

Done.

+  int patVertical = kBarPadVertical + kBarRadius;

[bruthig, 2016/04/27 18:56:00]

Should this be 'padVertical'?

[yiyix, 2016/05/02 15:55:03]

Done.

+  skcanvas->drawCircle(kShelfIconWidth / 2, kShelfIconHeight - patVertical, 2,

[bruthig, 2016/04/27 18:56:00]

Is it necessary to paint to the SkCanvas or would gfx::Canvas::DrawCircle()
work?

[yiyix, 2016/05/02 15:55:04]

Good catch. I draw the circle in Canvas now.

+                       paint);
+}
+
 }  // namespace ash