Rename get_animating_layout_manager() to GetAnimatingLayoutManager()

These methods call non-trivial methods and should be moved to the cc file.

Change-Id: I9b24047da4d48e90022edfc53498332bb333ec89
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2616644
Commit-Queue: Alan Cutter <alancutter@chromium.org>
Reviewed-by: Michael Wasserman <msw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842353}

chrome/browser/ui/views/extensions/extensions_toolbar_container.cc

@@ -87,7 +87,7 @@ ExtensionsToolbarContainer::ExtensionsToolbarContainer(Browser* browser,
   }
   extensions_button_->SetID(VIEW_ID_EXTENSIONS_MENU_BUTTON);
   AddMainButton(extensions_button_);
-  target_layout_manager()
+  GetTargetLayoutManager()
       ->SetFlexAllocationOrder(views::FlexAllocationOrder::kReverse)
       .SetDefault(views::kFlexBehaviorKey,
                   hide_icon_flex_specification.WithOrder(3));
@@ -136,7 +136,7 @@ void ExtensionsToolbarContainer::ShowWidgetForExtension(
   anchored_widgets_.push_back({widget, extension_id});
   widget->AddObserver(this);
   UpdateIconVisibility(extension_id);
-  animating_layout_manager()->PostOrQueueAction(base::BindOnce(
+  GetAnimatingLayoutManager()->PostOrQueueAction(base::BindOnce(
       &ExtensionsToolbarContainer::AnchorAndShowWidgetImmediately,
       weak_ptr_factory_.GetWeakPtr(), widget));
 }
@@ -207,9 +207,9 @@ void ExtensionsToolbarContainer::UpdateIconVisibility(
 
   if (must_show ||
       (CanShowIconInToolbar() && model_->IsActionPinned(extension_id)))
-    animating_layout_manager()->FadeIn(action_view);
+    GetAnimatingLayoutManager()->FadeIn(action_view);
   else
-    animating_layout_manager()->FadeOut(action_view);
+    GetAnimatingLayoutManager()->FadeOut(action_view);
 }
 
 void ExtensionsToolbarContainer::AnchorAndShowWidgetImmediately(
@@ -349,7 +349,7 @@ void ExtensionsToolbarContainer::PopOutAction(
   DCHECK(!popped_out_action_);
   popped_out_action_ = action;
   UpdateIconVisibility(action->GetId());
-  animating_layout_manager()->PostOrQueueAction(std::move(closure));
+  GetAnimatingLayoutManager()->PostOrQueueAction(std::move(closure));
   UpdateContainerVisibility();
 }
 
@@ -629,7 +629,7 @@ void ExtensionsToolbarContainer::OnDragExited() {
       drop_info_->action_id;
   drop_info_.reset();
   ReorderViews();
-  animating_layout_manager()->PostOrQueueAction(base::BindOnce(
+  GetAnimatingLayoutManager()->PostOrQueueAction(base::BindOnce(
       &ExtensionsToolbarContainer::SetExtensionIconVisibility,
       weak_ptr_factory_.GetWeakPtr(), dragged_extension_id, true));
 }
@@ -703,7 +703,7 @@ void ExtensionsToolbarContainer::UpdateContainerVisibility() {
   // Layout animation does not handle host view visibility changing; requires
   // resetting.
   if (was_visible != GetVisible())
-    animating_layout_manager()->ResetLayout();
+    GetAnimatingLayoutManager()->ResetLayout();
 
   if (!was_visible && GetVisible() && GetOnVisibleCallbackForTesting())
     std::move(GetOnVisibleCallbackForTesting()).Run();
@@ -719,7 +719,7 @@ bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const {
   if (display_mode_ != DisplayMode::kAutoHide)
     return true;
 
-  if (animating_layout_manager()->is_animating())
+  if (GetAnimatingLayoutManager()->is_animating())
     return true;
 
   // Is menu showing.
@@ -738,7 +738,7 @@ bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const {
 }
 
 void ExtensionsToolbarContainer::UpdateContainerVisibilityAfterAnimation() {
-  animating_layout_manager()->PostOrQueueAction(
+  GetAnimatingLayoutManager()->PostOrQueueAction(
       base::BindOnce(&ExtensionsToolbarContainer::UpdateContainerVisibility,
                      weak_ptr_factory_.GetWeakPtr()));
 }

chrome/browser/ui/views/toolbar/toolbar_icon_container_view.cc

@@ -89,8 +89,10 @@ class ToolbarIconContainerView::WidgetRestoreObserver
     const bool is_collapsed = observed_view->bounds().IsEmpty();
     if (is_collapsed != was_collapsed_) {
       was_collapsed_ = is_collapsed;
-      if (!is_collapsed)
-        toolbar_icon_container_view_->animating_layout_manager()->ResetLayout();
+      if (!is_collapsed) {
+        toolbar_icon_container_view_->GetAnimatingLayoutManager()
+            ->ResetLayout();
+      }
     }
   }
 
@@ -205,6 +207,21 @@ void ToolbarIconContainerView::OnViewBlurred(views::View* observed_view) {
   UpdateHighlight();
 }
 
+views::AnimatingLayoutManager*
+ToolbarIconContainerView::GetAnimatingLayoutManager() {
+  return static_cast<views::AnimatingLayoutManager*>(GetLayoutManager());
+}
+
+const views::AnimatingLayoutManager*
+ToolbarIconContainerView::GetAnimatingLayoutManager() const {
+  return static_cast<const views::AnimatingLayoutManager*>(GetLayoutManager());
+}
+
+views::FlexLayout* ToolbarIconContainerView::GetTargetLayoutManager() {
+  return static_cast<views::FlexLayout*>(
+      GetAnimatingLayoutManager()->target_layout_manager());
+}
+
 void ToolbarIconContainerView::OnBoundsChanged(
     const gfx::Rect& previous_bounds) {
   const gfx::Rect bounds = ConvertRectToWidget(GetLocalBounds());

chrome/browser/ui/views/toolbar/toolbar_icon_container_view.h

@@ -56,20 +56,11 @@ class ToolbarIconContainerView : public views::View,
   bool uses_highlight() const { return uses_highlight_; }
 
   // Provides access to the animating layout manager for subclasses.
-  views::AnimatingLayoutManager* animating_layout_manager() {
-    return static_cast<views::AnimatingLayoutManager*>(GetLayoutManager());
-  }
-
-  const views::AnimatingLayoutManager* animating_layout_manager() const {
-    return static_cast<const views::AnimatingLayoutManager*>(
-        GetLayoutManager());
-  }
+  views::AnimatingLayoutManager* GetAnimatingLayoutManager();
+  const views::AnimatingLayoutManager* GetAnimatingLayoutManager() const;
 
   // Provides access to the flex layout in the animating layout manager.
-  views::FlexLayout* target_layout_manager() {
-    return static_cast<views::FlexLayout*>(
-        animating_layout_manager()->target_layout_manager());
-  }
+  views::FlexLayout* GetTargetLayoutManager();
 
  protected:
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;

chrome/browser/ui/views/toolbar/toolbar_view.cc

@@ -698,7 +698,7 @@ void ToolbarView::InitLayout() {
   } else if (extensions_container_) {
     const views::FlexSpecification extensions_flex_rule =
         views::FlexSpecification(
-            extensions_container_->animating_layout_manager()
+            extensions_container_->GetAnimatingLayoutManager()
                 ->GetDefaultFlexRule())
             .WithOrder(kExtensionsFlexOrder);
 

chrome/browser/ui/views/web_apps/frame_toolbar/web_app_toolbar_button_container.cc

@@ -119,7 +119,7 @@ WebAppToolbarButtonContainer::WebAppToolbarButtonContainer(
       extensions_container_->SetProperty(
           views::kFlexBehaviorKey,
           views::FlexSpecification(
-              extensions_container_->animating_layout_manager()
+              extensions_container_->GetAnimatingLayoutManager()
                   ->GetDefaultFlexRule())
               .WithOrder(kLowPriorityFlexOrder));
       views::SetHitTestComponent(extensions_container_,