Handle view resize for ripple

ash/common/system/tray/tray_background_view.cc

 // 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.
 
 #include "ash/common/system/tray/tray_background_view.h"
 
 #include <algorithm>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 384 matching lines @@
 void TrayBackgroundView::AboutToRequestFocusFromTabTraversal(bool reverse) {
   // Return focus to the login view. See crbug.com/120500.
   views::View* v = GetNextFocusableView();
   if (v)
     v->AboutToRequestFocusFromTabTraversal(reverse);
 }
 
 std::unique_ptr<views::InkDropRipple> TrayBackgroundView::CreateInkDropRipple()
     const {
   return base::MakeUnique<views::FloodFillInkDropRipple>(
-      GetInkDropBounds(), GetInkDropCenterBasedOnLastEvent(),
+      size(), GetBackgroundInsets(), GetInkDropCenterBasedOnLastEvent(),
       GetInkDropBaseColor(), ink_drop_visible_opacity());
 }
 
 std::unique_ptr<views::InkDropHighlight>
 TrayBackgroundView::CreateInkDropHighlight() const {
-  gfx::Rect bounds = GetInkDropBounds();
+  gfx::Rect bounds = GetBackgroundBounds();
+  // Currently, we don't handle view resize. To compensate for that, enlarge the
+  // bounds by two tray icons so that the hightlight looks good even if two more
+  // icons are added when it is visible. Note that ink drop mask handles resize
+  // correctly, so the extra highlight would be clipped.
+  // TODO(mohsen): Remove this extra size when resize is handled properly (see
+  // https://crbug.com/669253).
+  const int icon_size =
+      kTrayIconSize + 2 * GetTrayConstant(TRAY_IMAGE_ITEM_PADDING);
+  bounds.set_width(bounds.width() + 2 * icon_size);
+  bounds.set_height(bounds.height() + 2 * icon_size);
   std::unique_ptr<views::InkDropHighlight> highlight(
       new views::InkDropHighlight(bounds.size(), 0,
                                   gfx::RectF(bounds).CenterPoint(),
                                   GetInkDropBaseColor()));
   highlight->set_visible_opacity(kTrayPopupInkDropHighlightOpacity);
   return highlight;
 }
 
 void TrayBackgroundView::OnGestureEvent(ui::GestureEvent* event) {
   // If there is no ink drop, show "touch feedback".
@@ skipping 203 matching lines @@
   // |insets| are relative to contents bounds. Change them to be relative to
   // local bounds.
   gfx::Insets local_contents_insets =
       GetLocalBounds().InsetsFrom(GetContentsBounds());
   MirrorInsetsIfNecessary(&local_contents_insets);
   insets += local_contents_insets;
 
   return insets;
 }
 
-gfx::Rect TrayBackgroundView::GetInkDropBounds() const {
+gfx::Rect TrayBackgroundView::GetBackgroundBounds() const {
   gfx::Insets insets = GetBackgroundInsets();
   gfx::Rect bounds = GetLocalBounds();
   bounds.Inset(insets);
-  // Currently, we don't handle view resize. To compensate for that, enlarge the
-  // bounds by two tray icons so that ripple looks good even if two more icons
-  // are added when ripple is active. Note that ink drop mask handles resize
-  // correctly, so the extra ripple would be clipped.
-  // TODO(mohsen): Remove this extra size when resize is handled properly (see
-  // https://crbug.com/666175).
-  const int icon_size =
-      kTrayIconSize + 2 * GetTrayConstant(TRAY_IMAGE_ITEM_PADDING);
-  bounds.set_width(bounds.width() + 2 * icon_size);
-  bounds.set_height(bounds.height() + 2 * icon_size);
   return bounds;
 }
 
 }  // namespace ash