Fix favicon disappearing on pinned tabs

chrome/browser/ui/views/tabs/media_indicator_button.cc

 // Copyright 2014 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 "chrome/browser/ui/views/tabs/media_indicator_button.h"
 
 #include "base/macros.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_controller.h"
 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
@@ skipping 31 matching lines @@
       : button_(button) {}
   ~FadeAnimationDelegate() override {}
 
  private:
   // gfx::AnimationDelegate
   void AnimationProgressed(const gfx::Animation* animation) override {
     button_->SchedulePaint();
   }
 
   void AnimationCanceled(const gfx::Animation* animation) override {
-    button_->showing_media_state_ = button_->media_state_;
-    button_->SchedulePaint();
+    AnimationEnded(animation);
   }
 
   void AnimationEnded(const gfx::Animation* animation) override {
     button_->showing_media_state_ = button_->media_state_;
-    button_->SchedulePaint();
+    button_->parent_tab_->MediaStateChanged();
   }
 
   MediaIndicatorButton* const button_;
 
   DISALLOW_COPY_AND_ASSIGN(FadeAnimationDelegate);
 };
 
 MediaIndicatorButton::MediaIndicatorButton(Tab* parent_tab)
     : views::ImageButton(NULL),
       parent_tab_(parent_tab),
       media_state_(TAB_MEDIA_STATE_NONE),
       showing_media_state_(TAB_MEDIA_STATE_NONE) {
   DCHECK(parent_tab_);
   SetEventTargeter(
       scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 }
 
 MediaIndicatorButton::~MediaIndicatorButton() {}
 
 void MediaIndicatorButton::TransitionToMediaState(TabMediaState next_state) {
   if (next_state == media_state_)
     return;
+  bool previous_media_showing_state = showing_media_state_;

[miu, 2016/02/01 20:28:32]

The type should be TabMediaState, not bool.

[enne (OOO), 2016/02/01 20:36:33]

Eep! Thanks.

 
   if (next_state != TAB_MEDIA_STATE_NONE)
     ResetImages(next_state);
 
   if ((media_state_ == TAB_MEDIA_STATE_AUDIO_PLAYING &&
        next_state == TAB_MEDIA_STATE_AUDIO_MUTING) ||
       (media_state_ == TAB_MEDIA_STATE_AUDIO_MUTING &&
        next_state == TAB_MEDIA_STATE_AUDIO_PLAYING) ||
       (media_state_ == TAB_MEDIA_STATE_AUDIO_MUTING &&
        next_state == TAB_MEDIA_STATE_NONE)) {
     // Instant user feedback: No fade animation.
     showing_media_state_ = next_state;
     fade_animation_.reset();
   } else {
     if (next_state == TAB_MEDIA_STATE_NONE)
       showing_media_state_ = media_state_;  // Fading-out indicator.
     else
       showing_media_state_ = next_state;  // Fading-in to next indicator.
     fade_animation_ = chrome::CreateTabMediaIndicatorFadeAnimation(next_state);
     if (!fade_animation_delegate_)
       fade_animation_delegate_.reset(new FadeAnimationDelegate(this));
     fade_animation_->set_delegate(fade_animation_delegate_.get());
     fade_animation_->Start();
   }
 
   media_state_ = next_state;
 
+  if (previous_media_showing_state != showing_media_state_)
+    parent_tab_->MediaStateChanged();
+
   UpdateEnabledForMuteToggle();
 
   // An indicator state change should be made visible immediately, instead of
   // the user being surprised when their mouse leaves the button.
   if (state() == views::CustomButton::STATE_HOVERED) {
     SetState(enabled() ? views::CustomButton::STATE_NORMAL :
              views::CustomButton::STATE_DISABLED);
   }
 
   // Note: The calls to SetImage(), SetEnabled(), and SetState() above will call
@@ skipping 138 matching lines @@
   SkColor color = parent_tab_->button_color();
   gfx::ImageSkia indicator_image =
       chrome::GetTabMediaIndicatorImage(state, color).AsImageSkia();
   SetImage(views::CustomButton::STATE_NORMAL, &indicator_image);
   SetImage(views::CustomButton::STATE_DISABLED, &indicator_image);
   gfx::ImageSkia affordance_image =
       chrome::GetTabMediaIndicatorAffordanceImage(state, color).AsImageSkia();
   SetImage(views::CustomButton::STATE_HOVERED, &affordance_image);
   SetImage(views::CustomButton::STATE_PRESSED, &affordance_image);
 }