Revert of Moved parent_->SchedulePaint() to Views::SetFillsBoundsOpaquely() and Views::ScheduleP

chrome/browser/ui/views/toolbar/toolbar_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 "chrome/browser/ui/views/toolbar/toolbar_button.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 212 matching lines @@
 }
 
 void ToolbarButton::AddInkDropLayer(ui::Layer* ink_drop_layer) {
   SetPaintToLayer(true);
   SetFillsBoundsOpaquely(false);
   image()->SetPaintToLayer(true);
   image()->SetFillsBoundsOpaquely(false);
 
   layer()->Add(ink_drop_layer);
   layer()->StackAtBottom(ink_drop_layer);
+
+  // Invalidates the contents of the parent's layer which may contain
+  // a stale close/reload icon that should not remain visible.
+  parent()->SchedulePaint();
 }
 
 void ToolbarButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
   layer()->Remove(ink_drop_layer);
 
   image()->SetFillsBoundsOpaquely(true);
   image()->SetPaintToLayer(false);
   SetPaintToLayer(false);
 }
 
@@ skipping 103 matching lines @@
     SetState(STATE_NORMAL);
 }
 
 const char* ToolbarButton::GetClassName() const {
   return "ToolbarButton";
 }
 
 gfx::Point ToolbarButton::CalculateInkDropCenter() const {
   return GetLocalBounds().CenterPoint();
 }