Add ink drop masking to TrayBackgroundView

ash/common/system/tray/tray_background_view.h

 // Copyright (c) 2012 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_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
 #define ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/shelf/shelf_background_animator_observer.h"
 #include "ash/common/system/tray/actionable_view.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "base/macros.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 
+namespace views {
+class RoundRectInkDropMask;
+}
+
 namespace ash {
 class ShelfLayoutManager;
 class TrayEventFilter;
 class TrayBackground;
 class WmShelf;
 
 // Base class for children of StatusAreaWidget: SystemTray, WebNotificationTray,
 // LogoutButtonTray, OverviewButtonTray.
 // This class handles setting and animating the background when the Launcher
 // is shown/hidden. It also inherits from ActionableView so that the tray
@@ skipping 43 matching lines @@
 
   // views::View:
   void SetVisible(bool visible) override;
   const char* GetClassName() const override;
   void ChildPreferredSizeChanged(views::View* child) override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
   void AboutToRequestFocusFromTabTraversal(bool reverse) override;
   void OnPaint(gfx::Canvas* canvas) override;
 
   // ActionableView:
+  void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
+  void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
   std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override;
   std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight()
       const override;
   bool ShouldEnterPushedState(const ui::Event& event) override;
   bool PerformAction(const ui::Event& event) override;
   void HandlePerformActionResult(bool action_performed,
                                  const ui::Event& event) override;
   gfx::Rect GetFocusBounds() override;
   void OnGestureEvent(ui::GestureEvent* event) override;
 
@@ skipping 78 matching lines @@
   // in non-MD version and how the ink drop ripples behave in MD version.
   bool is_active_;
 
   // Visibility of this tray's separator which is a line of 1x32px and 4px to
   // right of tray.
   bool is_separator_visible_;
 
   std::unique_ptr<TrayWidgetObserver> widget_observer_;
   std::unique_ptr<TrayEventFilter> tray_event_filter_;
 
+  std::unique_ptr<views::RoundRectInkDropMask> ink_drop_mask_;

[bruthig, 2016/11/11 20:16:43]

Capturing offline discussion:
Let's move the ownership of the mask up to InkDropHostView and add an
override-able InkDropHost::CreateInkDropMask() method. If any subclass needs to
reference the mask by the correct type we can add an override-able
InkDropHost::OnInkDropMaskDestroyed() and allow the subclass to keep a reference
to the mask it returns from the Create function.

[mohsen, 2016/11/13 23:31:29]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_