Remove DISALLOW_COPY_AND_ASSIGN from ui/views/extensions.

A few other mostly cpplint fixes, no functional changes.

Bug: 1010217
Change-Id: I0a723054e430242adea6f75b9ee33fc7fceb250d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2368418Reviewed-by: Collin Baker <collinbaker@chromium.org>
Commit-Queue: David Bienvenu <davidbienvenu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800837}

chrome/browser/ui/views/extensions/extensions_menu_button.h

@@ -31,6 +31,8 @@ class ExtensionsMenuButton : public views::LabelButton,
                        ExtensionsMenuItemView* parent,
                        ToolbarActionViewController* controller,
                        bool allow_pinning);
+  ExtensionsMenuButton(const ExtensionsMenuButton&) = delete;
+  ExtensionsMenuButton& operator=(const ExtensionsMenuButton&) = delete;
   ~ExtensionsMenuButton() override;
 
   static const char kClassName[];
@@ -64,8 +66,6 @@ class ExtensionsMenuButton : public views::LabelButton,
   ToolbarActionViewController* const controller_;
 
   bool allow_pinning_;
-
-  DISALLOW_COPY_AND_ASSIGN(ExtensionsMenuButton);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSIONS_MENU_BUTTON_H_

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

@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/views/extensions/extensions_menu_item_view.h"
 
+#include <utility>
+
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "chrome/app/vector_icons/vector_icons.h"
@@ -152,11 +154,11 @@ void ExtensionsMenuItemView::UpdatePinButton() {
       kSecondaryIconSizeDp, icon_color);
 }
 
-bool ExtensionsMenuItemView::IsContextMenuRunning() {
+bool ExtensionsMenuItemView::IsContextMenuRunning() const {
   return context_menu_controller_->IsMenuRunning();
 }
 
-bool ExtensionsMenuItemView::IsPinned() {
+bool ExtensionsMenuItemView::IsPinned() const {
   // |model_| can be null in unit tests.
   if (!model_)
     return false;

chrome/browser/ui/views/extensions/extensions_menu_item_view.h

@@ -35,6 +35,8 @@ class ExtensionsMenuItemView : public views::View,
       Browser* browser,
       std::unique_ptr<ToolbarActionViewController> controller,
       bool allow_pinning);
+  ExtensionsMenuItemView(const ExtensionsMenuItemView&) = delete;
+  ExtensionsMenuItemView& operator=(const ExtensionsMenuItemView&) = delete;
   ~ExtensionsMenuItemView() override;
 
   // views::ButtonListener:
@@ -46,9 +48,9 @@ class ExtensionsMenuItemView : public views::View,
 
   void UpdatePinButton();
 
-  bool IsContextMenuRunning();
+  bool IsContextMenuRunning() const;
 
-  bool IsPinned();
+  bool IsPinned() const;
 
   ToolbarActionViewController* view_controller() { return controller_.get(); }
   const ToolbarActionViewController* view_controller() const {
@@ -79,8 +81,6 @@ class ExtensionsMenuItemView : public views::View,
   // This controller is responsible for showing the context menu for an
   // extension.
   std::unique_ptr<ExtensionContextMenuController> context_menu_controller_;
-
-  DISALLOW_COPY_AND_ASSIGN(ExtensionsMenuItemView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSIONS_MENU_ITEM_VIEW_H_

chrome/browser/ui/views/extensions/extensions_menu_test_util.h

@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSIONS_MENU_TEST_UTIL_H_
 
 #include <memory>
+#include <string>
 
 #include "base/auto_reset.h"
-#include "base/macros.h"
 #include "chrome/browser/ui/extensions/extension_action_test_helper.h"
 
 class Browser;
@@ -21,7 +21,8 @@ class ExtensionsToolbarContainer;
 class ExtensionsMenuTestUtil : public ExtensionActionTestHelper {
  public:
   ExtensionsMenuTestUtil(Browser* browser, bool is_real_window);
-
+  ExtensionsMenuTestUtil(const ExtensionsMenuTestUtil&) = delete;
+  ExtensionsMenuTestUtil& operator=(const ExtensionsMenuTestUtil&) = delete;
   ~ExtensionsMenuTestUtil() override;
 
   // ExtensionActionTestHelper:
@@ -64,10 +65,8 @@ class ExtensionsMenuTestUtil : public ExtensionActionTestHelper {
   std::unique_ptr<Wrapper> wrapper_;
 
   Browser* const browser_;
-  ExtensionsToolbarContainer* extensions_container_;
+  ExtensionsToolbarContainer* extensions_container_ = nullptr;
   std::unique_ptr<ExtensionsMenuView> menu_view_;
-
-  DISALLOW_COPY_AND_ASSIGN(ExtensionsMenuTestUtil);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSIONS_MENU_TEST_UTIL_H_

chrome/browser/ui/views/extensions/extensions_menu_view.h

@@ -37,6 +37,8 @@ class ExtensionsMenuView : public views::BubbleDialogDelegateView,
                      Browser* browser,
                      ExtensionsContainer* extensions_container,
                      bool allow_pinning);
+  ExtensionsMenuView(const ExtensionsMenuView&) = delete;
+  ExtensionsMenuView& operator=(const ExtensionsMenuView&) = delete;
   ~ExtensionsMenuView() override;
 
   // Displays the ExtensionsMenu under |anchor_view|, attached to |browser|, and
@@ -185,8 +187,6 @@ class ExtensionsMenuView : public views::BubbleDialogDelegateView,
   Section cant_access_;
   Section wants_access_;
   Section has_access_;
-
-  DISALLOW_COPY_AND_ASSIGN(ExtensionsMenuView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSIONS_MENU_VIEW_H_

chrome/browser/ui/views/extensions/extensions_toolbar_button.h

@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSIONS_TOOLBAR_BUTTON_H_
 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSIONS_TOOLBAR_BUTTON_H_
 
+#include <memory>
+
 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
 #include "ui/views/controls/button/menu_button_controller.h"
 #include "ui/views/widget/widget_observer.h"
@@ -21,6 +23,8 @@ class ExtensionsToolbarButton : public ToolbarButton,
  public:
   ExtensionsToolbarButton(Browser* browser,
                           ExtensionsToolbarContainer* extensions_container);
+  ExtensionsToolbarButton(const ExtensionsToolbarButton&) = delete;
+  ExtensionsToolbarButton& operator=(const ExtensionsToolbarButton&) = delete;
   ~ExtensionsToolbarButton() override;
 
   // ToolbarButton:
@@ -45,8 +49,6 @@ class ExtensionsToolbarButton : public ToolbarButton,
   Browser* const browser_;
   views::MenuButtonController* menu_button_controller_;
   ExtensionsToolbarContainer* const extensions_container_;
-
-  DISALLOW_COPY_AND_ASSIGN(ExtensionsToolbarButton);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSIONS_TOOLBAR_BUTTON_H_

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

@@ -7,6 +7,8 @@
 
 #include <map>
 #include <memory>
+#include <set>
+#include <string>
 #include <vector>
 
 #include "base/optional.h"
@@ -55,6 +57,9 @@ class ExtensionsToolbarContainer : public ToolbarIconContainerView,
   explicit ExtensionsToolbarContainer(
       Browser* browser,
       DisplayMode display_mode = DisplayMode::kNormal);
+  ExtensionsToolbarContainer(const ExtensionsToolbarContainer&) = delete;
+  ExtensionsToolbarContainer& operator=(const ExtensionsToolbarContainer&) =
+      delete;
   ~ExtensionsToolbarContainer() override;
 
   ExtensionsToolbarButton* extensions_button() const {
@@ -240,8 +245,6 @@ class ExtensionsToolbarContainer : public ToolbarIconContainerView,
   std::unique_ptr<DropInfo> drop_info_;
 
   base::WeakPtrFactory<ExtensionsToolbarContainer> weak_ptr_factory_{this};
-
-  DISALLOW_COPY_AND_ASSIGN(ExtensionsToolbarContainer);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSIONS_TOOLBAR_CONTAINER_H_