MacViews: Remove redundant virtuals in NativeWidgetMac and co.

Strict virtual annotation checks were enabled on Mac in r311365.

This gets toolkit_views for Mac on board.

BUG=417463

Review URL: https://codereview.chromium.org/850843003

Cr-Commit-Position: refs/heads/master@{#311528}

ui/views/cocoa/bridged_native_widget.h

@@ -52,7 +52,7 @@ class VIEWS_EXPORT BridgedNativeWidget : public ui::LayerDelegate,
 
   // Creates one side of the bridge. |parent| must not be NULL.
   explicit BridgedNativeWidget(NativeWidgetMac* parent);
-  virtual ~BridgedNativeWidget();
+  ~BridgedNativeWidget() override;
 
   // Initialize the bridge, "retains" ownership of |window|.
   void Init(base::scoped_nsobject<NSWindow> window,
@@ -141,7 +141,7 @@ class VIEWS_EXPORT BridgedNativeWidget : public ui::LayerDelegate,
   bool window_visible() { return window_visible_; }
 
   // Overridden from internal::InputMethodDelegate:
-  virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) override;
+  void DispatchKeyEventPostIME(const ui::KeyEvent& key) override;
 
  private:
   // Closes all child windows. BridgedNativeWidget children will be destroyed.

ui/views/cocoa/bridged_native_widget_unittest.mm

@@ -78,7 +78,7 @@ class MockNativeWidgetMac : public NativeWidgetMac {
   }
 
   // internal::NativeWidgetPrivate:
-  virtual void InitNativeWidget(const Widget::InitParams& params) override {
+  void InitNativeWidget(const Widget::InitParams& params) override {
     ownership_ = params.ownership;
 
     // Usually the bridge gets initialized here. It is skipped to run extra
@@ -86,7 +86,7 @@ class MockNativeWidgetMac : public NativeWidgetMac {
     delegate()->OnNativeWidgetCreated(true);
   }
 
-  virtual void ReorderNativeViews() override {
+  void ReorderNativeViews() override {
     // Called via Widget::Init to set the content view. No-op in these tests.
   }
 
@@ -107,7 +107,7 @@ class BridgedNativeWidgetTestBase : public ui::CocoaTest {
   }
 
   // Overridden from testing::Test:
-  virtual void SetUp() override {
+  void SetUp() override {
     ui::CocoaTest::SetUp();
 
     init_params_.native_widget = native_widget_mac_;
@@ -133,7 +133,7 @@ class BridgedNativeWidgetTestBase : public ui::CocoaTest {
 class BridgedNativeWidgetTest : public BridgedNativeWidgetTestBase {
  public:
   BridgedNativeWidgetTest();
-  virtual ~BridgedNativeWidgetTest();
+  ~BridgedNativeWidgetTest() override;
 
   // Install a textfield in the view hierarchy and make it the text input
   // client.
@@ -143,8 +143,8 @@ class BridgedNativeWidgetTest : public BridgedNativeWidgetTestBase {
   std::string GetText();
 
   // testing::Test:
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
  protected:
   scoped_ptr<views::View> view_;

ui/views/controls/menu/menu_message_loop_mac.h

@@ -13,17 +13,17 @@ namespace views {
 class MenuMessageLoopMac : public MenuMessageLoop {
  public:
   MenuMessageLoopMac();
-  virtual ~MenuMessageLoopMac();
+  ~MenuMessageLoopMac() override;
 
   // Overridden from MenuMessageLoop:
-  virtual void Run(MenuController* controller,
-                   Widget* owner,
-                   bool nested_menu) override;
-  virtual void QuitNow() override;
-  virtual void RepostEventToWindow(const ui::LocatedEvent& event,
-                                   gfx::NativeWindow window,
-                                   const gfx::Point& screen_loc) override;
-  virtual void ClearOwner() override;
+  void Run(MenuController* controller,
+           Widget* owner,
+           bool nested_menu) override;
+  void QuitNow() override;
+  void RepostEventToWindow(const ui::LocatedEvent& event,
+                           gfx::NativeWindow window,
+                           const gfx::Point& screen_loc) override;
+  void ClearOwner() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MenuMessageLoopMac);

ui/views/controls/menu/menu_runner_cocoa_unittest.mm

@@ -15,9 +15,9 @@ namespace test {
 class MenuRunnerCocoaTest : public ViewsTestBase {
  public:
   MenuRunnerCocoaTest() : runner_(NULL) {}
-  virtual ~MenuRunnerCocoaTest() {}
+  ~MenuRunnerCocoaTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ViewsTestBase::SetUp();
 
     menu_.reset(new ui::SimpleMenuModel(NULL));
@@ -27,7 +27,7 @@ class MenuRunnerCocoaTest : public ViewsTestBase {
     EXPECT_FALSE(runner_->IsRunning());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     if (runner_) {
       runner_->Release();
       runner_ = NULL;

ui/views/controls/menu/menu_runner_impl_cocoa.h

@@ -20,18 +20,18 @@ class VIEWS_EXPORT MenuRunnerImplCocoa : public MenuRunnerImplInterface {
  public:
   explicit MenuRunnerImplCocoa(ui::MenuModel* menu);
 
-  virtual bool IsRunning() const override;
-  virtual void Release() override;
-  virtual MenuRunner::RunResult RunMenuAt(Widget* parent,
-                                          MenuButton* button,
-                                          const gfx::Rect& bounds,
-                                          MenuAnchorPosition anchor,
-                                          int32 run_types) override;
-  virtual void Cancel() override;
-  virtual base::TimeDelta GetClosingEventTime() const override;
+  bool IsRunning() const override;
+  void Release() override;
+  MenuRunner::RunResult RunMenuAt(Widget* parent,
+                                  MenuButton* button,
+                                  const gfx::Rect& bounds,
+                                  MenuAnchorPosition anchor,
+                                  int32 run_types) override;
+  void Cancel() override;
+  base::TimeDelta GetClosingEventTime() const override;
 
  private:
-  virtual ~MenuRunnerImplCocoa();
+  ~MenuRunnerImplCocoa() override;
 
   // The Cocoa menu controller that this instance is bridging.
   base::scoped_nsobject<MenuController> menu_controller_;

ui/views/controls/native/native_view_host_mac.h

@@ -17,21 +17,21 @@ class NativeViewHost;
 class VIEWS_EXPORT NativeViewHostMac : public NativeViewHostWrapper {
  public:
   explicit NativeViewHostMac(NativeViewHost* host);
-  virtual ~NativeViewHostMac();
+  ~NativeViewHostMac() override;
 
   // Overridden from NativeViewHostWrapper:
-  virtual void AttachNativeView() override;
-  virtual void NativeViewDetaching(bool destroyed) override;
-  virtual void AddedToWidget() override;
-  virtual void RemovedFromWidget() override;
-  virtual void InstallClip(int x, int y, int w, int h) override;
-  virtual bool HasInstalledClip() override;
-  virtual void UninstallClip() override;
-  virtual void ShowWidget(int x, int y, int w, int h) override;
-  virtual void HideWidget() override;
-  virtual void SetFocus() override;
-  virtual gfx::NativeViewAccessible GetNativeViewAccessible() override;
-  virtual gfx::NativeCursor GetCursor(int x, int y) override;
+  void AttachNativeView() override;
+  void NativeViewDetaching(bool destroyed) override;
+  void AddedToWidget() override;
+  void RemovedFromWidget() override;
+  void InstallClip(int x, int y, int w, int h) override;
+  bool HasInstalledClip() override;
+  void UninstallClip() override;
+  void ShowWidget(int x, int y, int w, int h) override;
+  void HideWidget() override;
+  void SetFocus() override;
+  gfx::NativeViewAccessible GetNativeViewAccessible() override;
+  gfx::NativeCursor GetCursor(int x, int y) override;
 
  private:
   // Our associated NativeViewHost. Owns this.

ui/views/event_monitor_mac.h

@@ -15,7 +15,7 @@ class EventMonitorMac : public EventMonitor {
  public:
   EventMonitorMac(ui::EventHandler* event_handler,
                   gfx::NativeWindow target_window);
-  virtual ~EventMonitorMac();
+  ~EventMonitorMac() override;
 
  private:
   id monitor_;

ui/views/test/event_generator_delegate_mac.mm

@@ -242,53 +242,48 @@ class EventGeneratorDelegateMac : public ui::EventTarget,
   }
 
   // Overridden from ui::EventTarget:
-  virtual bool CanAcceptEvent(const ui::Event& event) override { return true; }
-  virtual ui::EventTarget* GetParentTarget()  override { return NULL; }
-  virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override;
-  virtual ui::EventTargeter* GetEventTargeter() override {
-    return this;
-  }
+  bool CanAcceptEvent(const ui::Event& event) override { return true; }
+  ui::EventTarget* GetParentTarget() override { return NULL; }
+  scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override;
+  ui::EventTargeter* GetEventTargeter() override { return this; }
 
   // Overridden from ui::EventHandler (via ui::EventTarget):
-  virtual void OnMouseEvent(ui::MouseEvent* event) override;
+  void OnMouseEvent(ui::MouseEvent* event) override;
 
   // Overridden from ui::EventSource:
-  virtual ui::EventProcessor* GetEventProcessor() override { return this; }
+  ui::EventProcessor* GetEventProcessor() override { return this; }
 
   // Overridden from ui::EventProcessor:
-  virtual ui::EventTarget* GetRootTarget() override { return this; }
+  ui::EventTarget* GetRootTarget() override { return this; }
 
   // Overridden from ui::EventDispatcherDelegate (via ui::EventProcessor):
-  virtual bool CanDispatchToTarget(EventTarget* target) override {
-    return true;
-  }
+  bool CanDispatchToTarget(EventTarget* target) override { return true; }
 
   // Overridden from ui::test::EventGeneratorDelegate:
-  virtual void SetContext(ui::test::EventGenerator* owner,
-                          gfx::NativeWindow root_window,
-                          gfx::NativeWindow window) override;
-  virtual ui::EventTarget* GetTargetAt(const gfx::Point& location) override {
+  void SetContext(ui::test::EventGenerator* owner,
+                  gfx::NativeWindow root_window,
+                  gfx::NativeWindow window) override;
+  ui::EventTarget* GetTargetAt(const gfx::Point& location) override {
     return this;
   }
-  virtual ui::EventSource* GetEventSource(ui::EventTarget* target) override {
+  ui::EventSource* GetEventSource(ui::EventTarget* target) override {
     return this;
   }
-  virtual gfx::Point CenterOfTarget(
-      const ui::EventTarget* target) const override;
-  virtual gfx::Point CenterOfWindow(gfx::NativeWindow window) const override;
+  gfx::Point CenterOfTarget(const ui::EventTarget* target) const override;
+  gfx::Point CenterOfWindow(gfx::NativeWindow window) const override;
 
-  virtual void ConvertPointFromTarget(const ui::EventTarget* target,
-                                      gfx::Point* point) const override {}
-  virtual void ConvertPointToTarget(const ui::EventTarget* target,
-                                    gfx::Point* point) const override {}
-  virtual void ConvertPointFromHost(const ui::EventTarget* hosted_target,
-                                    gfx::Point* point) const override {}
+  void ConvertPointFromTarget(const ui::EventTarget* target,
+                              gfx::Point* point) const override {}
+  void ConvertPointToTarget(const ui::EventTarget* target,
+                            gfx::Point* point) const override {}
+  void ConvertPointFromHost(const ui::EventTarget* hosted_target,
+                            gfx::Point* point) const override {}
 
  private:
   friend struct DefaultSingletonTraits<EventGeneratorDelegateMac>;
 
   EventGeneratorDelegateMac();
-  virtual ~EventGeneratorDelegateMac();
+  ~EventGeneratorDelegateMac() override;
 
   ui::test::EventGenerator* owner_;
   NSWindow* window_;

ui/views/test/views_test_helper_mac.h

@@ -17,7 +17,7 @@ namespace views {
 class ViewsTestHelperMac : public ViewsTestHelper {
  public:
   ViewsTestHelperMac();
-  virtual ~ViewsTestHelperMac();
+  ~ViewsTestHelperMac() override;
 
  private:
   // Disable animations during tests.

ui/views/widget/native_widget_mac.h

@@ -18,7 +18,7 @@ class BridgedNativeWidget;
 class VIEWS_EXPORT NativeWidgetMac : public internal::NativeWidgetPrivate {
  public:
   NativeWidgetMac(internal::NativeWidgetDelegate* delegate);
-  virtual ~NativeWidgetMac();
+  ~NativeWidgetMac() override;
 
   // Retrieves the bridge associated with the given NSWindow. Returns null if
   // the supplied handle has no associated Widget.
@@ -30,95 +30,92 @@ class VIEWS_EXPORT NativeWidgetMac : public internal::NativeWidgetPrivate {
   void OnWindowWillClose();
 
   // internal::NativeWidgetPrivate:
-  virtual void InitNativeWidget(const Widget::InitParams& params) override;
-  virtual NonClientFrameView* CreateNonClientFrameView() override;
-  virtual bool ShouldUseNativeFrame() const override;
-  virtual bool ShouldWindowContentsBeTransparent() const override;
-  virtual void FrameTypeChanged() override;
-  virtual Widget* GetWidget() override;
-  virtual const Widget* GetWidget() const override;
-  virtual gfx::NativeView GetNativeView() const override;
-  virtual gfx::NativeWindow GetNativeWindow() const override;
-  virtual Widget* GetTopLevelWidget() override;
-  virtual const ui::Compositor* GetCompositor() const override;
-  virtual const ui::Layer* GetLayer() const override;
-  virtual void ReorderNativeViews() override;
-  virtual void ViewRemoved(View* view) override;
-  virtual void SetNativeWindowProperty(const char* name, void* value) override;
-  virtual void* GetNativeWindowProperty(const char* name) const override;
-  virtual TooltipManager* GetTooltipManager() const override;
-  virtual void SetCapture() override;
-  virtual void ReleaseCapture() override;
-  virtual bool HasCapture() const override;
-  virtual InputMethod* CreateInputMethod() override;
-  virtual internal::InputMethodDelegate* GetInputMethodDelegate() override;
-  virtual ui::InputMethod* GetHostInputMethod() override;
-  virtual void CenterWindow(const gfx::Size& size) override;
-  virtual void GetWindowPlacement(
-      gfx::Rect* bounds,
-      ui::WindowShowState* maximized) const override;
-  virtual bool SetWindowTitle(const base::string16& title) override;
-  virtual void SetWindowIcons(const gfx::ImageSkia& window_icon,
-                              const gfx::ImageSkia& app_icon) override;
-  virtual void InitModalType(ui::ModalType modal_type) override;
-  virtual gfx::Rect GetWindowBoundsInScreen() const override;
-  virtual gfx::Rect GetClientAreaBoundsInScreen() const override;
-  virtual gfx::Rect GetRestoredBounds() const override;
-  virtual void SetBounds(const gfx::Rect& bounds) override;
-  virtual void SetSize(const gfx::Size& size) override;
-  virtual void StackAbove(gfx::NativeView native_view) override;
-  virtual void StackAtTop() override;
-  virtual void StackBelow(gfx::NativeView native_view) override;
-  virtual void SetShape(gfx::NativeRegion shape) override;
-  virtual void Close() override;
-  virtual void CloseNow() override;
-  virtual void Show() override;
-  virtual void Hide() override;
-  virtual void ShowMaximizedWithBounds(
-      const gfx::Rect& restored_bounds) override;
-  virtual void ShowWithWindowState(ui::WindowShowState state) override;
-  virtual bool IsVisible() const override;
-  virtual void Activate() override;
-  virtual void Deactivate() override;
-  virtual bool IsActive() const override;
-  virtual void SetAlwaysOnTop(bool always_on_top) override;
-  virtual bool IsAlwaysOnTop() const override;
-  virtual void SetVisibleOnAllWorkspaces(bool always_visible) override;
-  virtual void Maximize() override;
-  virtual void Minimize() override;
-  virtual bool IsMaximized() const override;
-  virtual bool IsMinimized() const override;
-  virtual void Restore() override;
-  virtual void SetFullscreen(bool fullscreen) override;
-  virtual bool IsFullscreen() const override;
-  virtual void SetOpacity(unsigned char opacity) override;
-  virtual void SetUseDragFrame(bool use_drag_frame) override;
-  virtual void FlashFrame(bool flash_frame) override;
-  virtual void RunShellDrag(View* view,
-                            const ui::OSExchangeData& data,
-                            const gfx::Point& location,
-                            int operation,
-                            ui::DragDropTypes::DragEventSource source) override;
-  virtual void SchedulePaintInRect(const gfx::Rect& rect) override;
-  virtual void SetCursor(gfx::NativeCursor cursor) override;
-  virtual bool IsMouseEventsEnabled() const override;
-  virtual void ClearNativeFocus() override;
-  virtual gfx::Rect GetWorkAreaBoundsInScreen() const override;
-  virtual Widget::MoveLoopResult RunMoveLoop(
+  void InitNativeWidget(const Widget::InitParams& params) override;
+  NonClientFrameView* CreateNonClientFrameView() override;
+  bool ShouldUseNativeFrame() const override;
+  bool ShouldWindowContentsBeTransparent() const override;
+  void FrameTypeChanged() override;
+  Widget* GetWidget() override;
+  const Widget* GetWidget() const override;
+  gfx::NativeView GetNativeView() const override;
+  gfx::NativeWindow GetNativeWindow() const override;
+  Widget* GetTopLevelWidget() override;
+  const ui::Compositor* GetCompositor() const override;
+  const ui::Layer* GetLayer() const override;
+  void ReorderNativeViews() override;
+  void ViewRemoved(View* view) override;
+  void SetNativeWindowProperty(const char* name, void* value) override;
+  void* GetNativeWindowProperty(const char* name) const override;
+  TooltipManager* GetTooltipManager() const override;
+  void SetCapture() override;
+  void ReleaseCapture() override;
+  bool HasCapture() const override;
+  InputMethod* CreateInputMethod() override;
+  internal::InputMethodDelegate* GetInputMethodDelegate() override;
+  ui::InputMethod* GetHostInputMethod() override;
+  void CenterWindow(const gfx::Size& size) override;
+  void GetWindowPlacement(gfx::Rect* bounds,
+                          ui::WindowShowState* maximized) const override;
+  bool SetWindowTitle(const base::string16& title) override;
+  void SetWindowIcons(const gfx::ImageSkia& window_icon,
+                      const gfx::ImageSkia& app_icon) override;
+  void InitModalType(ui::ModalType modal_type) override;
+  gfx::Rect GetWindowBoundsInScreen() const override;
+  gfx::Rect GetClientAreaBoundsInScreen() const override;
+  gfx::Rect GetRestoredBounds() const override;
+  void SetBounds(const gfx::Rect& bounds) override;
+  void SetSize(const gfx::Size& size) override;
+  void StackAbove(gfx::NativeView native_view) override;
+  void StackAtTop() override;
+  void StackBelow(gfx::NativeView native_view) override;
+  void SetShape(gfx::NativeRegion shape) override;
+  void Close() override;
+  void CloseNow() override;
+  void Show() override;
+  void Hide() override;
+  void ShowMaximizedWithBounds(const gfx::Rect& restored_bounds) override;
+  void ShowWithWindowState(ui::WindowShowState state) override;
+  bool IsVisible() const override;
+  void Activate() override;
+  void Deactivate() override;
+  bool IsActive() const override;
+  void SetAlwaysOnTop(bool always_on_top) override;
+  bool IsAlwaysOnTop() const override;
+  void SetVisibleOnAllWorkspaces(bool always_visible) override;
+  void Maximize() override;
+  void Minimize() override;
+  bool IsMaximized() const override;
+  bool IsMinimized() const override;
+  void Restore() override;
+  void SetFullscreen(bool fullscreen) override;
+  bool IsFullscreen() const override;
+  void SetOpacity(unsigned char opacity) override;
+  void SetUseDragFrame(bool use_drag_frame) override;
+  void FlashFrame(bool flash_frame) override;
+  void RunShellDrag(View* view,
+                    const ui::OSExchangeData& data,
+                    const gfx::Point& location,
+                    int operation,
+                    ui::DragDropTypes::DragEventSource source) override;
+  void SchedulePaintInRect(const gfx::Rect& rect) override;
+  void SetCursor(gfx::NativeCursor cursor) override;
+  bool IsMouseEventsEnabled() const override;
+  void ClearNativeFocus() override;
+  gfx::Rect GetWorkAreaBoundsInScreen() const override;
+  Widget::MoveLoopResult RunMoveLoop(
       const gfx::Vector2d& drag_offset,
       Widget::MoveLoopSource source,
       Widget::MoveLoopEscapeBehavior escape_behavior) override;
-  virtual void EndMoveLoop() override;
-  virtual void SetVisibilityChangedAnimationsEnabled(bool value) override;
-  virtual void SetVisibilityAnimationDuration(
-      const base::TimeDelta& duration) override;
-  virtual void SetVisibilityAnimationTransition(
+  void EndMoveLoop() override;
+  void SetVisibilityChangedAnimationsEnabled(bool value) override;
+  void SetVisibilityAnimationDuration(const base::TimeDelta& duration) override;
+  void SetVisibilityAnimationTransition(
       Widget::VisibilityTransition transition) override;
-  virtual ui::NativeTheme* GetNativeTheme() const override;
-  virtual void OnRootViewLayout() override;
-  virtual bool IsTranslucentWindowOpacitySupported() const override;
-  virtual void OnSizeConstraintsChanged() override;
-  virtual void RepostNativeEvent(gfx::NativeEvent native_event) override;
+  ui::NativeTheme* GetNativeTheme() const override;
+  void OnRootViewLayout() override;
+  bool IsTranslucentWindowOpacitySupported() const override;
+  void OnSizeConstraintsChanged() override;
+  void RepostNativeEvent(gfx::NativeEvent native_event) override;
 
  protected:
   internal::NativeWidgetDelegate* delegate() { return delegate_; }

ui/views/widget/native_widget_mac_interactive_uitest.mm

@@ -42,7 +42,7 @@ class NativeWidgetMacInteractiveUITest::Observer : public TestWidgetObserver {
   Observer(NativeWidgetMacInteractiveUITest* parent, Widget* widget)
       : TestWidgetObserver(widget), parent_(parent) {}
 
-  virtual void OnWidgetActivationChanged(Widget* widget, bool active) override {
+  void OnWidgetActivationChanged(Widget* widget, bool active) override {
     if (active)
       parent_->activationCount_++;
     else