Refactoring to make adding ink drop animations easier

chrome/browser/ui/views/toolbar/app_menu_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/app_menu_button.h"
 
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
@@ skipping 180 matching lines @@
 }
 
 void AppMenuButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
   layer()->Remove(ink_drop_layer);
 
   image()->SetFillsBoundsOpaquely(true);
   image()->SetPaintToLayer(false);
   SetPaintToLayer(false);
 }
 
+gfx::Point AppMenuButton::CalculateInkDropCenter() const {
+  // ToolbarView extends the bounds of the app button to the right in maximized
+  // mode. So instead of using the center point of local bounds, we use the
+  // center point of preferred size which doesn't change in maximized mode.
+  return gfx::Rect(GetPreferredSize()).CenterPoint();
+}
+
 const char* AppMenuButton::GetClassName() const {
   return "AppMenuButton";
 }
 
 bool AppMenuButton::GetDropFormats(
     int* formats,
     std::set<ui::Clipboard::FormatType>* format_types) {
   return allow_extension_dragging_ ?
       BrowserActionDragData::GetDropFormats(format_types) :
       views::View::GetDropFormats(formats, format_types);
 }
 
 bool AppMenuButton::AreDropTypesRequired() {
   return allow_extension_dragging_ ?
       BrowserActionDragData::AreDropTypesRequired() :
       views::View::AreDropTypesRequired();
 }
 
 bool AppMenuButton::CanDrop(const ui::OSExchangeData& data) {
   return allow_extension_dragging_ ?
       BrowserActionDragData::CanDrop(data,
                                      toolbar_view_->browser()->profile()) :
       views::View::CanDrop(data);
 }
 
 void AppMenuButton::Layout() {
   MenuButton::Layout();
-
-  // ToolbarView extends the bounds of the app button to the right in maximized
-  // mode. So instead of using the center point of local bounds, we use the
-  // center point of preferred size which doesn't change in maximized mode.
-  ink_drop_animation_controller_->SetInkDropCenter(
-      gfx::Rect(GetPreferredSize()).CenterPoint());
+  ink_drop_animation_controller_->SetInkDropCenter(CalculateInkDropCenter());
 }
 
 void AppMenuButton::OnDragEntered(const ui::DropTargetEvent& event) {
   DCHECK(allow_extension_dragging_);
   DCHECK(!weak_factory_.HasWeakPtrs());
   if (!g_open_app_immediately_for_testing) {
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&AppMenuButton::ShowMenu, weak_factory_.GetWeakPtr(), true),
         base::TimeDelta::FromMilliseconds(views::GetMenuShowDelay()));
@@ skipping 17 matching lines @@
   return ui::DragDropTypes::DRAG_MOVE;
 }
 
 void AppMenuButton::OnPaint(gfx::Canvas* canvas) {
   views::MenuButton::OnPaint(canvas);
   if (ui::MaterialDesignController::IsModeMaterial())
     return;
   icon_painter_->Paint(canvas, GetThemeProvider(), gfx::Rect(size()),
                        AppMenuIconPainter::BEZEL_NONE);
 }