[focus]Replace DISALLOW_COPY_AND_ASSIGN macros in views/focus

Remove use of base/macro.h and use explicit deletion instead

Bug: 1010217
Change-Id: I74180731b700bdff4f2735111d8dede3ae4733b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2342332
Commit-Queue: Hyunjune Kim <hyunjune.kim@samsung.com>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796243}

ui/views/focus/external_focus_tracker.h

@@ -8,7 +8,6 @@
 #include <memory>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ui/views/focus/focus_manager.h"
 
 namespace views {
@@ -32,6 +31,9 @@ class ViewTracker;
 class VIEWS_EXPORT ExternalFocusTracker : public FocusChangeListener {
  public:
   ExternalFocusTracker(View* parent_view, FocusManager* focus_manager);
+
+  ExternalFocusTracker(const ExternalFocusTracker&) = delete;
+  ExternalFocusTracker& operator=(const ExternalFocusTracker&) = delete;
   ~ExternalFocusTracker() override;
 
   // FocusChangeListener:
@@ -68,8 +70,6 @@ class VIEWS_EXPORT ExternalFocusTracker : public FocusChangeListener {
 
   // Holds the last focused view.
   std::unique_ptr<ViewTracker> last_focused_view_tracker_;
-
-  DISALLOW_COPY_AND_ASSIGN(ExternalFocusTracker);
 };
 
 }  // namespace views

ui/views/focus/focus_manager.h

@@ -7,7 +7,6 @@
 
 #include <memory>
 
-#include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/base/accelerators/accelerator_manager.h"
 #include "ui/views/view_observer.h"
@@ -143,6 +142,9 @@ class VIEWS_EXPORT FocusManager : public ViewObserver {
   enum class FocusCycleWrapping { kEnabled, kDisabled };
 
   FocusManager(Widget* widget, std::unique_ptr<FocusManagerDelegate> delegate);
+
+  FocusManager(const FocusManager&) = delete;
+  FocusManager& operator=(const FocusManager&) = delete;
   ~FocusManager() override;
 
   // Processes the passed key event for accelerators and keyboard traversal.
@@ -379,8 +381,6 @@ class VIEWS_EXPORT FocusManager : public ViewObserver {
 
   // Whether FocusManager is currently trying to restore a focused view.
   bool in_restoring_focused_view_ = false;
-
-  DISALLOW_COPY_AND_ASSIGN(FocusManager);
 };
 
 }  // namespace views

ui/views/focus/focus_manager_factory.cc

@@ -14,15 +14,16 @@ namespace {
 class DefaultFocusManagerFactory : public FocusManagerFactory {
  public:
   DefaultFocusManagerFactory() = default;
+
+  DefaultFocusManagerFactory(const DefaultFocusManagerFactory&) = delete;
+  DefaultFocusManagerFactory& operator=(const DefaultFocusManagerFactory&) =
+      delete;
   ~DefaultFocusManagerFactory() override = default;
 
  protected:
   std::unique_ptr<FocusManager> CreateFocusManager(Widget* widget) override {
     return std::make_unique<FocusManager>(widget, nullptr /* delegate */);
   }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(DefaultFocusManagerFactory);
 };
 
 FocusManagerFactory* g_focus_manager_factory = nullptr;

ui/views/focus/focus_manager_factory.h

@@ -7,7 +7,6 @@
 
 #include <memory>
 
-#include "base/macros.h"
 #include "ui/views/views_export.h"
 
 namespace views {
@@ -28,13 +27,13 @@ class VIEWS_EXPORT FocusManagerFactory {
 
  protected:
   FocusManagerFactory();
+
+  FocusManagerFactory(const FocusManagerFactory&) = delete;
+  FocusManagerFactory& operator=(const FocusManagerFactory&) = delete;
   virtual ~FocusManagerFactory();
 
   // Create a FocusManager for the given |widget|.
   virtual std::unique_ptr<FocusManager> CreateFocusManager(Widget* widget) = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(FocusManagerFactory);
 };
 
 }  // namespace views

ui/views/focus/focus_search.h

@@ -6,7 +6,6 @@
 #define UI_VIEWS_FOCUS_FOCUS_SEARCH_H_
 
 #include "base/containers/flat_set.h"
-#include "base/macros.h"
 #include "ui/views/view.h"
 
 namespace views {
@@ -54,6 +53,9 @@ class VIEWS_EXPORT FocusSearch {
   //   needed and you want to check IsAccessibilityFocusable(), rather than
   //   IsFocusable().
   FocusSearch(View* root, bool cycle, bool accessibility_mode);
+
+  FocusSearch(const FocusSearch&) = delete;
+  FocusSearch& operator=(const FocusSearch&) = delete;
   virtual ~FocusSearch() = default;
 
   // Finds the next view that should be focused and returns it. If a
@@ -149,8 +151,6 @@ class VIEWS_EXPORT FocusSearch {
   View* root_;
   bool cycle_;
   bool accessibility_mode_;
-
-  DISALLOW_COPY_AND_ASSIGN(FocusSearch);
 };
 
 }  // namespace views

ui/views/focus/focus_traversal_unittest.cc

@@ -138,6 +138,9 @@ class BorderView : public NativeViewHost {
     SetFocusBehavior(FocusBehavior::NEVER);
   }
 
+  BorderView(const BorderView&) = delete;
+  BorderView& operator=(const BorderView&) = delete;
+
   virtual internal::RootView* GetContentsRootView() {
     return static_cast<internal::RootView*>(widget_->GetRootView());
   }
@@ -172,14 +175,14 @@ class BorderView : public NativeViewHost {
  private:
   View* child_;
   std::unique_ptr<Widget> widget_;
-
-  DISALLOW_COPY_AND_ASSIGN(BorderView);
 };
 
 }  // namespace
 
 class FocusTraversalTest : public FocusManagerTest {
  public:
+  FocusTraversalTest(const FocusTraversalTest&) = delete;
+  FocusTraversalTest& operator=(const FocusTraversalTest&) = delete;
   ~FocusTraversalTest() override;
 
   void InitContentView() override;
@@ -226,8 +229,6 @@ class FocusTraversalTest : public FocusManagerTest {
   DummyComboboxModel combobox_model_;
   PaneView* left_container_;
   PaneView* right_container_;
-
-  DISALLOW_COPY_AND_ASSIGN(FocusTraversalTest);
 };
 
 FocusTraversalTest::FocusTraversalTest() = default;
@@ -813,15 +814,16 @@ TEST_F(FocusTraversalTest, PaneTraversal) {
 
 class FocusTraversalNonFocusableTest : public FocusManagerTest {
  public:
+  FocusTraversalNonFocusableTest(const FocusTraversalNonFocusableTest&) =
+      delete;
+  FocusTraversalNonFocusableTest& operator=(
+      const FocusTraversalNonFocusableTest&) = delete;
   ~FocusTraversalNonFocusableTest() override = default;
 
   void InitContentView() override;
 
  protected:
   FocusTraversalNonFocusableTest() = default;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(FocusTraversalNonFocusableTest);
 };
 
 void FocusTraversalNonFocusableTest::InitContentView() {

ui/views/focus/widget_focus_manager.h

@@ -5,7 +5,6 @@
 #ifndef UI_VIEWS_FOCUS_WIDGET_FOCUS_MANAGER_H_
 #define UI_VIEWS_FOCUS_WIDGET_FOCUS_MANAGER_H_
 
-#include "base/macros.h"
 #include "base/no_destructor.h"
 #include "base/observer_list.h"
 #include "ui/gfx/native_widget_types.h"
@@ -53,13 +52,13 @@ class VIEWS_EXPORT WidgetFocusManager {
   friend class base::NoDestructor<WidgetFocusManager>;
 
   WidgetFocusManager();
+  WidgetFocusManager(const WidgetFocusManager&) = delete;
+  WidgetFocusManager& operator=(const WidgetFocusManager&) = delete;
 
   base::ObserverList<WidgetFocusChangeListener>::Unchecked
       focus_change_listeners_;
 
   bool enabled_ = true;
-
-  DISALLOW_COPY_AND_ASSIGN(WidgetFocusManager);
 };
 
 // A basic helper class that is used to disable native focus change
@@ -67,10 +66,12 @@ class VIEWS_EXPORT WidgetFocusManager {
 class VIEWS_EXPORT AutoNativeNotificationDisabler {
  public:
   AutoNativeNotificationDisabler();
-  ~AutoNativeNotificationDisabler();
+  AutoNativeNotificationDisabler(const AutoNativeNotificationDisabler&) =
+      delete;
+  AutoNativeNotificationDisabler& operator=(
+      const AutoNativeNotificationDisabler&) = delete;
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(AutoNativeNotificationDisabler);
+  ~AutoNativeNotificationDisabler();
 };
 
 }  // namespace views