[Views] Update ink drop for omnibox icons

ui/views/animation/ink_drop.h

 // Copyright 2015 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 UI_VIEWS_ANIMATION_INK_DROP_H_
 #define UI_VIEWS_ANIMATION_INK_DROP_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "ui/compositor/layer_tree_owner.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
+#include "ui/views/animation/ink_drop_observer.h"

[bruthig, 2017/03/22 17:20:16]

Can this be forward declared instead?

[spqchan, 2017/03/24 17:58:03]

Done.

 #include "ui/views/animation/ink_drop_state.h"
 #include "ui/views/view.h"
 #include "ui/views/views_export.h"
 
 namespace views {
 
 // Pure virtual base class that manages the lifetime and state of an ink drop
 // ripple as well as visual hover state feedback.
 class VIEWS_EXPORT InkDrop {
  public:
@@ skipping 13 matching lines @@
   // the only one available because it was the only InkDropState that clients
   // needed to skip animations for.
   virtual void SnapToActivated() = 0;
 
   // Enables or disables the hover state.
   virtual void SetHovered(bool is_hovered) = 0;
 
   // Enables or disables the focus state.
   virtual void SetFocused(bool is_focused) = 0;
 
+  // Returns true if the highlight animation is in the process of fading in or
+  // is visible.
+  virtual bool IsHighlightFadingInOrVisible() const = 0;
+
+  // Sets the observer of this object.
+  void SetObserver(InkDropObserver* observer);

[bruthig, 2017/03/22 17:20:16]

I'd prefer if this used the Add/RemoveObserver() collection paradigm instead.

[spqchan, 2017/03/24 17:58:03]

Done.

+
  protected:
-  InkDrop() {}
+  InkDrop() : observer_(nullptr) {}
+
+  InkDropObserver* observer_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InkDrop);
 };
 
 // A View which can be used to parent ink drop layers. Typically this is used
 // as a non-ancestor view to labels so that the labels can paint on an opaque
 // canvas. This is used to avoid ugly text renderings when labels with subpixel
 // rendering enabled are painted onto a non-opaque canvas.
 class VIEWS_EXPORT InkDropContainerView : public views::View {
  public:
   InkDropContainerView();
 
   void AddInkDropLayer(ui::Layer* ink_drop_layer);
   void RemoveInkDropLayer(ui::Layer* ink_drop_layer);
 
   // View:
   bool CanProcessEventsWithinSubtree() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InkDropContainerView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_ANIMATION_INK_DROP_H_