Fix some nits in ReloadButton and ToolbarButton.

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

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

@@ -135,9 +135,10 @@ void ReloadButton::ButtonPressed(views::Button* /* button */,
   ClearPendingMenu();
 
   if (visible_mode_ == Mode::kStop) {
-    if (command_updater_)
+    if (command_updater_) {
       command_updater_->ExecuteCommandWithDisposition(
           IDC_STOP, WindowOpenDisposition::CURRENT_TAB);
+    }
     // The user has clicked, so we can feel free to update the button, even if
     // the mouse is still hovering.
     ChangeMode(Mode::kReload, true);
@@ -216,8 +217,8 @@ void ReloadButton::ExecuteCommand(int command_id, int event_flags) {
 
 std::unique_ptr<ui::SimpleMenuModel> ReloadButton::CreateMenuModel() {
   auto menu_model = std::make_unique<ui::SimpleMenuModel>(this);
-  for (size_t i = 0; i < arraysize(kReloadMenuItems); ++i)
-    menu_model->AddItemWithStringId(kReloadMenuItems[i], kReloadMenuItems[i]);
+  for (int item : kReloadMenuItems)
+    menu_model->AddItemWithStringId(item, item);
   return menu_model;
 }
 

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

@@ -229,17 +229,18 @@ void ToolbarButton::ShowDropDownMenu(ui::MenuSourceType source_type) {
 
   AnimateInkDrop(views::InkDropState::ACTIVATED, nullptr /* event */);
 
-  // Exit if the model is null.
-  if (!model_.get())
+  // Exit if the model is null. Although ToolbarButton::ShouldShowMenu()
+  // performs the same check, its overrides may not.
+  if (!model_)
     return;
 
   // Create and run menu.
-  menu_model_adapter_.reset(new views::MenuModelAdapter(
-      model_.get(),
-      base::Bind(&ToolbarButton::OnMenuClosed, base::Unretained(this))));
+  menu_model_adapter_ = std::make_unique<views::MenuModelAdapter>(
+      model_.get(), base::BindRepeating(&ToolbarButton::OnMenuClosed,
+                                        base::Unretained(this)));
   menu_model_adapter_->set_triggerable_event_flags(triggerable_event_flags());
-  menu_runner_.reset(new views::MenuRunner(menu_model_adapter_->CreateMenu(),
-                                           views::MenuRunner::HAS_MNEMONICS));
+  menu_runner_ = std::make_unique<views::MenuRunner>(
+      menu_model_adapter_->CreateMenu(), views::MenuRunner::HAS_MNEMONICS);
   menu_runner_->RunMenuAt(GetWidget(), nullptr,
                           gfx::Rect(menu_position, gfx::Size(0, 0)),
                           views::MENU_ANCHOR_TOPLEFT, source_type);