Do not pass a Profile* to ToolbarButton.

It is not used for anything. (anymore)

Change-Id: I9bb1d203e12f750065f250072e9c7a3a305535cc
Reviewed-on: https://chromium-review.googlesource.com/1112900
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570125}

chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc

@@ -188,7 +188,7 @@ void SimpleWebViewDialog::Init() {
                                       this, true);
 
   // Reload button.
-  reload_ = new ReloadButton(profile_, command_updater_.get());
+  reload_ = new ReloadButton(command_updater_.get());
   reload_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON |
                                        ui::EF_MIDDLE_MOUSE_BUTTON);
   reload_->set_tag(IDC_RELOAD);

chrome/browser/ui/views/profiles/avatar_toolbar_button.cc

@@ -32,7 +32,7 @@
 
 AvatarToolbarButton::AvatarToolbarButton(Profile* profile,
                                          views::ButtonListener* listener)
-    : ToolbarButton(profile, listener, nullptr),
+    : ToolbarButton(listener, nullptr),
       profile_(profile),
 #if !defined(OS_CHROMEOS)
       error_controller_(this, profile_),

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

@@ -148,7 +148,7 @@ void HomePageUndoBubble::WindowClosing() {
 // HomeButton -----------------------------------------------------------
 
 HomeButton::HomeButton(views::ButtonListener* listener, Browser* browser)
-    : ToolbarButton(browser->profile(), listener, nullptr), browser_(browser) {}
+    : ToolbarButton(listener, nullptr), browser_(browser) {}
 
 HomeButton::~HomeButton() {
 }

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

@@ -46,8 +46,8 @@ const gfx::VectorIcon& GetIconForMode(bool is_reload) {
 // static
 const char ReloadButton::kViewClassName[] = "ReloadButton";
 
-ReloadButton::ReloadButton(Profile* profile, CommandUpdater* command_updater)
-    : ToolbarButton(profile, this, CreateMenuModel()),
+ReloadButton::ReloadButton(CommandUpdater* command_updater)
+    : ToolbarButton(this, CreateMenuModel()),
       command_updater_(command_updater),
       double_click_timer_delay_(
           base::TimeDelta::FromMilliseconds(views::GetDoubleClickInterval())),

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

@@ -32,7 +32,7 @@ class ReloadButton : public ToolbarButton,
   // The button's class name.
   static const char kViewClassName[];
 
-  ReloadButton(Profile* profile, CommandUpdater* command_updater);
+  explicit ReloadButton(CommandUpdater* command_updater);
   ~ReloadButton() override;
 
   // Ask for a specified button state.  If |force| is true this will be applied

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

@@ -37,7 +37,7 @@ class ReloadButtonTest : public ChromeRenderViewHostTestHarness {
   DISALLOW_COPY_AND_ASSIGN(ReloadButtonTest);
 };
 
-ReloadButtonTest::ReloadButtonTest() : reload_(profile(), nullptr) {
+ReloadButtonTest::ReloadButtonTest() : reload_(nullptr) {
   // Set the timer delays to 0 so that timers will fire as soon as we tell the
   // message loop to run pending tasks.
   reload_.double_click_timer_delay_ = base::TimeDelta();

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

@@ -9,7 +9,6 @@
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/layout_constants.h"
@@ -27,11 +26,9 @@
 #include "ui/views/style/platform_style.h"
 #include "ui/views/widget/widget.h"
 
-ToolbarButton::ToolbarButton(Profile* profile,
-                             views::ButtonListener* listener,
+ToolbarButton::ToolbarButton(views::ButtonListener* listener,
                              std::unique_ptr<ui::MenuModel> model)
     : views::ImageButton(listener),
-      profile_(profile),
       model_(std::move(model)),
       show_menu_factory_(this) {
   set_has_ink_drop_action_on_click(true);

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

@@ -13,8 +13,6 @@
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/image_button.h"
 
-class Profile;
-
 namespace test {
 class ToolbarButtonTestApi;
 }
@@ -35,10 +33,9 @@ class MenuRunner;
 class ToolbarButton : public views::ImageButton,
                       public views::ContextMenuController {
  public:
-  // The profile and listener pointers must outlive this class. The model can
-  // be null if no menu is to be shown.
-  ToolbarButton(Profile* profile,
-                views::ButtonListener* listener,
+  // The listener pointers must outlive this class. The model can be null if no
+  // menu is to be shown.
+  ToolbarButton(views::ButtonListener* listener,
                 std::unique_ptr<ui::MenuModel> model);
   ~ToolbarButton() override;
 
@@ -92,9 +89,6 @@ class ToolbarButton : public views::ImageButton,
   // views::ImageButton:
   const char* GetClassName() const override;
 
-  // The associated profile. The browser theme affects rendering.
-  Profile* profile_;
-
   // The model that populates the attached menu.
   std::unique_ptr<ui::MenuModel> model_;
 

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

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
 
-#include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/view_event_test_base.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/views/controls/menu/menu_runner.h"
@@ -38,13 +37,12 @@ class ToolbarButtonUITest : public ViewEventTestBase {
     // ToolbarButton takes ownership of the |model|.
     auto model = std::make_unique<ui::SimpleMenuModel>(nullptr);
     model->AddItem(0, base::string16());
-    button_ = new ToolbarButton(&profile_, nullptr, std::move(model));
+    button_ = new ToolbarButton(nullptr, std::move(model));
     return button_;
   }
   void DoTestOnMessageLoop() override {}
 
  protected:
-  TestingProfile profile_;
   ToolbarButton* button_ = nullptr;
 
  private:

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

@@ -148,9 +148,8 @@ void ToolbarView::Init() {
   }
 
   back_ = new ToolbarButton(
-      browser_->profile(), this,
-      std::make_unique<BackForwardMenuModel>(
-          browser_, BackForwardMenuModel::ModelType::kBackward));
+      this, std::make_unique<BackForwardMenuModel>(
+                browser_, BackForwardMenuModel::ModelType::kBackward));
   back_->set_hide_ink_drop_when_showing_context_menu(false);
   back_->set_triggerable_event_flags(
       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON);
@@ -163,9 +162,8 @@ void ToolbarView::Init() {
   back_->Init();
 
   forward_ = new ToolbarButton(
-      browser_->profile(), this,
-      std::make_unique<BackForwardMenuModel>(
-          browser_, BackForwardMenuModel::ModelType::kForward));
+      this, std::make_unique<BackForwardMenuModel>(
+                browser_, BackForwardMenuModel::ModelType::kForward));
   forward_->set_hide_ink_drop_when_showing_context_menu(false);
   forward_->set_triggerable_event_flags(
       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON);
@@ -177,8 +175,7 @@ void ToolbarView::Init() {
   forward_->set_id(VIEW_ID_FORWARD_BUTTON);
   forward_->Init();
 
-  reload_ =
-      new ReloadButton(browser_->profile(), browser_->command_controller());
+  reload_ = new ReloadButton(browser_->command_controller());
   reload_->set_triggerable_event_flags(
       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON);
   reload_->set_tag(IDC_RELOAD);