Clean up redundant getter for AppMenuButton

This is a simple clean up CL that has no changes in behaviour.
The bubble anchor code can use the recently added ButtonProvider
instead of a specialised getter on FrameView.

Change-Id: Ia067afe36f07c3ce4b77344c28f6467e4a9a1801
Bug: 811178
Reviewed-on: https://chromium-review.googlesource.com/950642Reviewed-by: calamity <calamity@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Commit-Queue: Alan Cutter <alancutter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541727}

chrome/browser/ui/browser_command_controller.cc

@@ -679,7 +679,7 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
       break;
     case IDC_HOSTED_APP_MENU_APP_INFO:
       ShowPageInfoDialog(browser_->tab_strip_model()->GetActiveWebContents(),
-                         bubble_anchor_util::kHostedAppMenu);
+                         bubble_anchor_util::kAppMenuButton);
       break;
 
     default:

chrome/browser/ui/bubble_anchor_util.h

@@ -19,7 +19,7 @@ namespace bubble_anchor_util {
 // Used as a parameter of GetPageInfoAnchorView().
 enum Anchor {
   kLocationBar,
-  kHostedAppMenu,
+  kAppMenuButton,
 };
 
 // Offset from the window edge to show bubbles when there is no location bar.

chrome/browser/ui/views/bubble_anchor_util_views.cc

@@ -28,11 +28,8 @@ views::View* GetPageInfoAnchorView(Browser* browser, Anchor anchor) {
 
   if (anchor == kLocationBar)
     return browser_view->GetLocationBarView()->GetSecurityBubbleAnchorView();
-  if (anchor == kHostedAppMenu) {
-    auto* frame_view = static_cast<BrowserNonClientFrameView*>(
-        browser_view->GetWidget()->non_client_view()->frame_view());
-    return frame_view->GetHostedAppMenuView();
-  }
+  if (anchor == kAppMenuButton)
+    return browser_view->button_provider()->GetAppMenuButton();
   NOTREACHED();
   return nullptr;
 }

chrome/browser/ui/views/frame/browser_non_client_frame_view.cc

@@ -86,11 +86,6 @@ views::View* BrowserNonClientFrameView::GetProfileSwitcherView() const {
   return profile_switcher_.view();
 }
 
-views::View* BrowserNonClientFrameView::GetHostedAppMenuView() {
-  NOTREACHED();
-  return nullptr;
-}
-
 void BrowserNonClientFrameView::UpdateClientArea() {}
 
 void BrowserNonClientFrameView::UpdateMinimumSize() {}

chrome/browser/ui/views/frame/browser_non_client_frame_view.h

@@ -71,9 +71,6 @@ class BrowserNonClientFrameView : public views::NonClientFrameView,
   // doesn't.
   views::View* GetProfileSwitcherView() const;
 
-  // Returns the hosted app menu, asserts that it is present.
-  virtual views::View* GetHostedAppMenuView();
-
   // Provided for mus. Updates the client-area of the WindowTreeHostMus.
   virtual void UpdateClientArea();
 

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

@@ -245,11 +245,6 @@ void BrowserNonClientFrameViewAsh::UpdateMinimumSize() {
   }
 }
 
-views::View* BrowserNonClientFrameViewAsh::GetHostedAppMenuView() {
-  DCHECK(hosted_app_button_container_);
-  return hosted_app_button_container_;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // views::NonClientFrameView:
 

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h

@@ -47,7 +47,6 @@ class BrowserNonClientFrameViewAsh : public BrowserNonClientFrameView,
   int GetThemeBackgroundXInset() const override;
   void UpdateThrobber(bool running) override;
   void UpdateMinimumSize() override;
-  views::View* GetHostedAppMenuView() override;
 
   // views::NonClientFrameView:
   gfx::Rect GetBoundsForClientView() const override;