Take size in ink drop masks instead of bounds

ash/common/system/tray/tray_popup_utils.cc

 // Copyright 2016 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_popup_utils.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/ash_view_ids.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 325 matching lines @@
   highlight->set_visible_opacity(kTrayPopupInkDropHighlightOpacity);
   return highlight;
 }
 
 std::unique_ptr<views::InkDropMask> TrayPopupUtils::CreateInkDropMask(
     TrayPopupInkDropStyle ink_drop_style,
     const views::View* host) {
   if (ink_drop_style == TrayPopupInkDropStyle::FILL_BOUNDS)
     return nullptr;
 
-  const gfx::Rect layer_bounds = host->GetLocalBounds();
+  const gfx::Size layer_size = host->size();
   const gfx::Rect mask_bounds = GetInkDropBounds(ink_drop_style, host);
   switch (ink_drop_style) {
     case TrayPopupInkDropStyle::HOST_CENTERED: {
       const int radius =
           std::min(mask_bounds.width(), mask_bounds.height()) / 2;
       return base::MakeUnique<views::CircleInkDropMask>(
-          layer_bounds, mask_bounds.CenterPoint(), radius);
+          layer_size, mask_bounds.CenterPoint(), radius);
     }
     case TrayPopupInkDropStyle::INSET_BOUNDS:
       return base::MakeUnique<views::RoundRectInkDropMask>(
-          layer_bounds, mask_bounds, kTrayPopupInkDropCornerRadius);
+          layer_size, mask_bounds, kTrayPopupInkDropCornerRadius);
     case TrayPopupInkDropStyle::FILL_BOUNDS:
       // Handled by quick return above.
       break;
   }
   // Required by some compilers.
   NOTREACHED();
   return nullptr;
 }
 
 gfx::Rect TrayPopupUtils::GetInkDropBounds(TrayPopupInkDropStyle ink_drop_style,
                                            const views::View* host) {
   gfx::Rect bounds = host->GetLocalBounds();
   if (ink_drop_style == TrayPopupInkDropStyle::HOST_CENTERED ||
       ink_drop_style == TrayPopupInkDropStyle::INSET_BOUNDS) {
     bounds.Inset(kTrayPopupInkDropInset, kTrayPopupInkDropInset);
   }
   return bounds;
 }
 
 bool TrayPopupUtils::CanOpenWebUISettings(LoginStatus status) {
   // TODO(tdanderson): Consider moving this into WmShell, or introduce a
   // CanShowSettings() method in each delegate type that has a
   // ShowSettings() method.
   return status != LoginStatus::NOT_LOGGED_IN &&
          status != LoginStatus::LOCKED &&
          !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 }
 
 }  // namespace ash