Rename BrowserViewButtonProvider as ToolbarButtonProvider

This CL is a pure rename and has no behavioural changes.
This renames BrowserViewButtonProvider to ToolbarButtonProvider.
This is intended to be an interface that HostedAppButtonContainer
and ToolbarView implement to expose access to their common buttons.

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

chrome/browser/ui/BUILD.gn

@@ -3104,7 +3104,6 @@ split_static_library("ui") {
         "views/frame/browser_root_view.h",
         "views/frame/browser_view.cc",
         "views/frame/browser_view.h",
-        "views/frame/browser_view_button_provider.h",
         "views/frame/browser_view_commands_mac.h",
         "views/frame/browser_view_commands_mac.mm",
         "views/frame/browser_view_layout.cc",
@@ -3131,6 +3130,7 @@ split_static_library("ui") {
         "views/frame/system_menu_model_builder.h",
         "views/frame/system_menu_model_delegate.cc",
         "views/frame/system_menu_model_delegate.h",
+        "views/frame/toolbar_button_provider.h",
         "views/frame/top_container_view.cc",
         "views/frame/top_container_view.h",
         "views/frame/web_contents_close_handler.cc",

chrome/browser/ui/views/accessibility/invert_bubble_view.cc

@@ -10,7 +10,7 @@
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/views/frame/app_menu_button.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "chrome/browser/ui/views/frame/browser_view_button_provider.h"
+#include "chrome/browser/ui/views/frame/toolbar_button_provider.h"
 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/harmony/chrome_typography.h"
 #include "chrome/common/pref_names.h"
@@ -186,7 +186,8 @@ void InvertBubbleView::OpenLink(const std::string& url, int event_flags) {
 void MaybeShowInvertBubbleView(BrowserView* browser_view) {
   Browser* browser = browser_view->browser();
   PrefService* pref_service = browser->profile()->GetPrefs();
-  views::View* anchor = browser_view->button_provider()->GetAppMenuButton();
+  views::View* anchor =
+      browser_view->toolbar_button_provider()->GetAppMenuButton();
   if (color_utils::IsInvertedColorScheme() && anchor && anchor->GetWidget() &&
       !pref_service->GetBoolean(prefs::kInvertNotificationShown)) {
     pref_service->SetBoolean(prefs::kInvertNotificationShown, true);

chrome/browser/ui/views/bubble_anchor_util_views.cc

@@ -30,7 +30,7 @@ views::View* GetPageInfoAnchorView(Browser* browser, Anchor anchor) {
   if (anchor == kLocationBar)
     return browser_view->GetLocationBarView()->GetSecurityBubbleAnchorView();
   if (anchor == kAppMenuButton)
-    return browser_view->button_provider()->GetAppMenuButton();
+    return browser_view->toolbar_button_provider()->GetAppMenuButton();
   NOTREACHED();
   return nullptr;
 }

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

@@ -108,7 +108,7 @@ views::View* AnchorViewForBrowser(ExtensionInstalledBubble* controller,
 
   // Default case.
   if (!reference_view || !reference_view->visible())
-    return browser_view->button_provider()->GetAppMenuButton();
+    return browser_view->toolbar_button_provider()->GetAppMenuButton();
   return reference_view;
 }
 #else  // OS_MACOSX && !MAC_VIEWS_BROWSER

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

@@ -46,7 +46,7 @@ ToolbarActionView* GetExtensionAnchorView(const std::string& extension_id,
       BrowserView::GetBrowserViewForNativeWindow(window);
   if (!browser_view)
     return nullptr;
-  ToolbarActionView* reference_view = browser_view->button_provider()
+  ToolbarActionView* reference_view = browser_view->toolbar_button_provider()
                                           ->GetBrowserActionsContainer()
                                           ->GetViewForId(extension_id);
   return reference_view && reference_view->visible() ? reference_view : nullptr;

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

@@ -829,7 +829,8 @@ void BrowserView::OnActiveTabChanged(content::WebContents* old_contents,
 }
 
 void BrowserView::ZoomChangedForActiveTab(bool can_show_bubble) {
-  const AppMenuButton* app_menu_button = button_provider_->GetAppMenuButton();
+  const AppMenuButton* app_menu_button =
+      toolbar_button_provider_->GetAppMenuButton();
   bool app_menu_showing = app_menu_button && app_menu_button->IsMenuShowing();
   GetLocationBarView()->ZoomChangedForActiveTab(can_show_bubble &&
                                                 !app_menu_showing);
@@ -956,10 +957,10 @@ void BrowserView::FullscreenStateChanged() {
   ProcessFullscreen(false, GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE);
 }
 
-void BrowserView::SetButtonProvider(BrowserViewButtonProvider* provider) {
-  // There should only be one button provider.
-  DCHECK(!button_provider_);
-  button_provider_ = provider;
+void BrowserView::SetToolbarButtonProvider(ToolbarButtonProvider* provider) {
+  // There should only be one toolbar button provider.
+  DCHECK(!toolbar_button_provider_);
+  toolbar_button_provider_ = provider;
 }
 
 LocationBar* BrowserView::GetLocationBar() const {
@@ -1033,7 +1034,7 @@ void BrowserView::FocusToolbar() {
 
 ToolbarActionsBar* BrowserView::GetToolbarActionsBar() {
   BrowserActionsContainer* container =
-      button_provider_->GetBrowserActionsContainer();
+      toolbar_button_provider_->GetBrowserActionsContainer();
   return container ? container->toolbar_actions_bar() : nullptr;
 }
 
@@ -1190,7 +1191,7 @@ autofill::SaveCardBubbleView* BrowserView::ShowSaveCreditCardBubble(
     if (card_view && card_view->visible())
       anchor_view = card_view;
     else
-      anchor_view = button_provider()->GetAppMenuButton();
+      anchor_view = toolbar_button_provider()->GetAppMenuButton();
   }
 
   autofill::SaveCardBubbleViews* bubble = new autofill::SaveCardBubbleViews(
@@ -1276,7 +1277,7 @@ void BrowserView::UserChangedTheme() {
 }
 
 void BrowserView::ShowAppMenu() {
-  if (!button_provider_->GetAppMenuButton())
+  if (!toolbar_button_provider_->GetAppMenuButton())
     return;
 
   // Keep the top-of-window views revealed as long as the app menu is visible.
@@ -1284,7 +1285,7 @@ void BrowserView::ShowAppMenu() {
       immersive_mode_controller_->GetRevealedLock(
           ImmersiveModeController::ANIMATE_REVEAL_NO));
 
-  button_provider_->GetAppMenuButton()->Activate(nullptr);
+  toolbar_button_provider_->GetAppMenuButton()->Activate(nullptr);
 }
 
 content::KeyboardEventProcessingResult BrowserView::PreHandleKeyboardEvent(
@@ -2178,8 +2179,8 @@ void BrowserView::InitViews() {
 
   // This browser view may already have a custom button provider set (e.g the
   // hosted app frame).
-  if (!button_provider_)
-    SetButtonProvider(toolbar_);
+  if (!toolbar_button_provider_)
+    SetToolbarButtonProvider(toolbar_);
 
   infobar_container_ = new InfoBarContainerView(this);
   AddChildView(infobar_container_);

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

@@ -52,7 +52,6 @@
 // view: http://dev.chromium.org/developers/design-documents/browser-window
 
 class BookmarkBarView;
-class BrowserViewButtonProvider;
 class Browser;
 class BrowserViewLayout;
 class ContentsLayoutManager;
@@ -63,6 +62,7 @@ class InfoBarContainerView;
 class LocationBarView;
 class StatusBubbleViews;
 class TabStrip;
+class ToolbarButtonProvider;
 class ToolbarView;
 class TopContainerView;
 class WebContentsCloseHandler;
@@ -260,8 +260,10 @@ class BrowserView : public BrowserWindow,
 
   // Sets the button provider for this BrowserView. Must be called before
   // InitViews() which sets the ToolbarView as the default button provider.
-  void SetButtonProvider(BrowserViewButtonProvider* provider);
-  BrowserViewButtonProvider* button_provider() { return button_provider_; }
+  void SetToolbarButtonProvider(ToolbarButtonProvider* provider);
+  ToolbarButtonProvider* toolbar_button_provider() {
+    return toolbar_button_provider_;
+  }
 
   // Overridden from BrowserWindow:
   void Show() override;
@@ -684,9 +686,9 @@ class BrowserView : public BrowserWindow,
   // Handled by ContentsLayoutManager.
   views::View* contents_container_ = nullptr;
 
-  // Provides access to the buttons this browser view uses. Buttons may appear
-  // in the frame or in the toolbar.
-  BrowserViewButtonProvider* button_provider_ = nullptr;
+  // Provides access to the toolbar buttons this browser view uses. Buttons may
+  // appear in a hosted app frame or in a tabbed UI toolbar.
+  ToolbarButtonProvider* toolbar_button_provider_ = nullptr;
 
   // Tracks and stores the last focused view which is not the
   // devtools_web_view_ or any of its children. Used to restore focus once

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

@@ -167,7 +167,7 @@ HostedAppButtonContainer::HostedAppButtonContainer(BrowserView* browser_view,
   app_menu_button_->SetIconColor(active_icon_color);
   AddChildView(app_menu_button_);
 
-  browser_view_->SetButtonProvider(this);
+  browser_view_->SetToolbarButtonProvider(this);
 }
 
 HostedAppButtonContainer::~HostedAppButtonContainer() {}

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

@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "chrome/browser/ui/views/frame/browser_view_button_provider.h"
+#include "chrome/browser/ui/views/frame/toolbar_button_provider.h"
 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 #include "ui/views/view.h"
@@ -28,7 +28,7 @@ class MenuButton;
 // A container for hosted app buttons in the title bar.
 class HostedAppButtonContainer : public views::View,
                                  public BrowserActionsContainer::Delegate,
-                                 public BrowserViewButtonProvider {
+                                 public ToolbarButtonProvider {
  public:
   // |active_icon_color| and |inactive_icon_color| indicate the colors to use
   // for button icons when the window is focused and blurred respectively.
@@ -69,7 +69,7 @@ class HostedAppButtonContainer : public views::View,
       Browser* browser,
       ToolbarActionsBar* main_bar) const override;
 
-  // BrowserViewButtonProvider:
+  // ToolbarButtonProvider:
   BrowserActionsContainer* GetBrowserActionsContainer() override;
   AppMenuButton* GetAppMenuButton() override;
 

chrome/browser/ui/views/frame/browser_view_button_provider.h → chrome/browser/ui/views/frame/toolbar_button_provider.h

@@ -2,25 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_BUTTON_PROVIDER_H_
-#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_BUTTON_PROVIDER_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_TOOLBAR_BUTTON_PROVIDER_H_
+#define CHROME_BROWSER_UI_VIEWS_FRAME_TOOLBAR_BUTTON_PROVIDER_H_
 
 class AppMenuButton;
 class BrowserActionsContainer;
 
-// An interface implemented by a class that provides buttons that a BrowserView
-// uses.
-class BrowserViewButtonProvider {
+// An interface implemented by a view contains and provides access to toolbar
+// buttons in a BrowserView.
+class ToolbarButtonProvider {
  public:
-  // Returns the container for extension icons.
+  // Gets the browser actions container.
   virtual BrowserActionsContainer* GetBrowserActionsContainer() = 0;
 
-  // Get the app menu button for the BrowserView.
+  // Gets the app menu button.
   virtual AppMenuButton* GetAppMenuButton() = 0;
 
   // TODO(calamity): Move other buttons and button actions into here.
  protected:
-  virtual ~BrowserViewButtonProvider() {}
+  virtual ~ToolbarButtonProvider() {}
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_BUTTON_PROVIDER_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_FRAME_TOOLBAR_BUTTON_PROVIDER_H_

chrome/browser/ui/views/global_error_bubble_view.cc

@@ -53,7 +53,7 @@ views::View* GetGlobalErrorBubbleAnchorView(Browser* browser) {
     return nullptr;
 #endif
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
-  return browser_view->button_provider()->GetAppMenuButton();
+  return browser_view->toolbar_button_provider()->GetAppMenuButton();
 }
 
 gfx::Rect GetGlobalErrorBubbleAnchorRect(Browser* browser) {

chrome/browser/ui/views/ime/ime_warning_bubble_view.cc

@@ -13,7 +13,7 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/frame/app_menu_button.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "chrome/browser/ui/views/frame/browser_view_button_provider.h"
+#include "chrome/browser/ui/views/frame/toolbar_button_provider.h"
 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/harmony/chrome_typography.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
@@ -140,7 +140,8 @@ void ImeWarningBubbleView::InitAnchorView() {
   }
   if (!reference_view || !reference_view->visible()) {
     // Anchors the bubble to the app menu.
-    reference_view = browser_view_->button_provider()->GetAppMenuButton();
+    reference_view =
+        browser_view_->toolbar_button_provider()->GetAppMenuButton();
   }
   SetAnchorView(reference_view);
   set_arrow(views::BubbleBorder::TOP_RIGHT);

chrome/browser/ui/views/session_crashed_bubble_view.cc

@@ -25,7 +25,7 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/frame/app_menu_button.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "chrome/browser/ui/views/frame/browser_view_button_provider.h"
+#include "chrome/browser/ui/views/frame/toolbar_button_provider.h"
 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/harmony/chrome_typography.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
@@ -94,7 +94,7 @@ views::View* GetSessionCrashedBubbleAnchorView(Browser* browser) {
     return nullptr;
 #endif
   return BrowserView::GetBrowserViewForBrowser(browser)
-      ->button_provider()
+      ->toolbar_button_provider()
       ->GetAppMenuButton();
 }
 #else  // OS_MACOSX && !MAC_VIEWS_BROWSER

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

@@ -280,7 +280,7 @@ void BrowserActionsContainer::ShowToolbarActionBubble(
       anchored_to_action_view = true;
     } else {
       anchor_view = BrowserView::GetBrowserViewForBrowser(browser_)
-                        ->button_provider()
+                        ->toolbar_button_provider()
                         ->GetAppMenuButton();
     }
   } else {

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

@@ -38,7 +38,7 @@ ExtensionToolbarMenuView::ExtensionToolbarMenuView(
   SetBackgroundColor(SK_ColorTRANSPARENT);
   BrowserActionsContainer* main =
       BrowserView::GetBrowserViewForBrowser(browser_)
-          ->button_provider()
+          ->toolbar_button_provider()
           ->GetBrowserActionsContainer();
   container_ = new BrowserActionsContainer(browser_, main, main->delegate());
   SetContents(container_);

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

@@ -699,7 +699,7 @@ void ToolbarView::UpdateSeverity(AppMenuIconController::IconType type,
   }
 }
 
-// BrowserViewButtonProvider:
+// ToolbarButtonProvider:
 BrowserActionsContainer* ToolbarView::GetBrowserActionsContainer() {
   return browser_actions_;
 }

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

@@ -13,7 +13,7 @@
 #include "chrome/browser/command_observer.h"
 #include "chrome/browser/ui/toolbar/app_menu_icon_controller.h"
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
-#include "chrome/browser/ui/views/frame/browser_view_button_provider.h"
+#include "chrome/browser/ui/views/frame/toolbar_button_provider.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 #include "chrome/browser/upgrade_observer.h"
@@ -54,7 +54,7 @@ class ToolbarView : public views::AccessiblePaneView,
                     public views::ButtonListener,
                     public AppMenuIconController::Delegate,
                     public UpgradeObserver,
-                    public BrowserViewButtonProvider {
+                    public ToolbarButtonProvider {
  public:
   // The view class name.
   static const char kViewClassName[];
@@ -141,7 +141,7 @@ class ToolbarView : public views::AccessiblePaneView,
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
-  // UpgradeObserver implementation.
+  // UpgradeObserver toolbar_button_view_provider.
   void OnOutdatedInstall() override;
   void OnOutdatedInstallNoAutoUpdate() override;
   void OnCriticalUpgradeInstalled() override;
@@ -181,7 +181,7 @@ class ToolbarView : public views::AccessiblePaneView,
                       AppMenuIconController::Severity severity,
                       bool animate) override;
 
-  // BrowserViewButtonProvider:
+  // ToolbarButtonProvider:
   BrowserActionsContainer* GetBrowserActionsContainer() override;
   AppMenuButton* GetAppMenuButton() override;