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 193 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 (adjusted for RTL layouts) of the preferred size, which
+  // doesn't change in maximized mode.
+  const int visible_width = GetPreferredSize().width();
+  return gfx::Point(
+      (GetMirroredXWithWidthInView(0, visible_width) + visible_width) / 2,
+      height() / 2);
+}
+
 const char* AppMenuButton::GetClassName() const {
   return "AppMenuButton";
 }
 
 scoped_ptr<views::LabelButtonBorder> AppMenuButton::CreateDefaultBorder()
     const {
   scoped_ptr<views::LabelButtonBorder> border =
       MenuButton::CreateDefaultBorder();
 
   // Adjust border insets to follow the margin change,
@@ skipping 28 matching lines @@
 
 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 (adjusted for RTL layouts) of preferred size which doesn't
-  // change in maximized mode.
-  const int visible_width = GetPreferredSize().width();
-  ink_drop_animation_controller_->SetInkDropCenter(gfx::Point(
-      (GetMirroredXWithWidthInView(0, visible_width) + visible_width) / 2,
-      height() / 2));
+  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 21 matching lines @@
   views::MenuButton::OnPaint(canvas);
   if (ui::MaterialDesignController::IsModeMaterial())
     return;
   // Use GetPreferredSize() to center the icon inside the visible bounds rather
   // than the whole size() (which may refer to hit test region extended to the
   // end of the toolbar in maximized mode).
   icon_painter_->Paint(canvas, GetThemeProvider(),
                        gfx::Rect(GetPreferredSize()),
                        AppMenuIconPainter::BEZEL_NONE);
 }