Commit c189d183 authored by mostynb's avatar mostynb Committed by Commit bot

remove some new OVERRIDE instances in ui/

BUG=417463

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

Cr-Commit-Position: refs/heads/master@{#299444}
parent ecf42bae
...@@ -111,7 +111,7 @@ class AppsGridDelegateBridge : public AppListItemListObserver { ...@@ -111,7 +111,7 @@ class AppsGridDelegateBridge : public AppListItemListObserver {
[parent_ listItemMovedFromIndex:from_index [parent_ listItemMovedFromIndex:from_index
toModelIndex:to_index]; toModelIndex:to_index];
} }
virtual void OnAppListItemHighlight(size_t index, bool highlight) OVERRIDE { virtual void OnAppListItemHighlight(size_t index, bool highlight) override {
// NSCollectionView (or -[AppsGridController scrollToPage]) ensures only one // NSCollectionView (or -[AppsGridController scrollToPage]) ensures only one
// item is highlighted, so clearing a highlight isn't necessary. // item is highlighted, so clearing a highlight isn't necessary.
if (!highlight) if (!highlight)
......
...@@ -74,15 +74,15 @@ class SatisfySwapPromise : public cc::SwapPromise { ...@@ -74,15 +74,15 @@ class SatisfySwapPromise : public cc::SwapPromise {
explicit SatisfySwapPromise(uint32_t id) : id_(id) {} explicit SatisfySwapPromise(uint32_t id) : id_(id) {}
private: private:
virtual void DidSwap(cc::CompositorFrameMetadata* metadata) OVERRIDE { virtual void DidSwap(cc::CompositorFrameMetadata* metadata) override {
metadata->satisfies_sequences.push_back(id_); metadata->satisfies_sequences.push_back(id_);
} }
virtual void DidNotSwap(DidNotSwapReason reason) OVERRIDE { virtual void DidNotSwap(DidNotSwapReason reason) override {
// TODO(jbauman): Send to the SurfaceManager immediately. // TODO(jbauman): Send to the SurfaceManager immediately.
DCHECK(false); DCHECK(false);
} }
virtual int64 TraceId() const OVERRIDE { return 0; } virtual int64 TraceId() const override { return 0; }
uint32_t id_; uint32_t id_;
}; };
......
...@@ -52,8 +52,8 @@ class DriWindow : public PlatformWindow, ...@@ -52,8 +52,8 @@ class DriWindow : public PlatformWindow,
virtual uint32_t DispatchEvent(const PlatformEvent& event) override; virtual uint32_t DispatchEvent(const PlatformEvent& event) override;
// ChannelObserver: // ChannelObserver:
virtual void OnChannelEstablished() OVERRIDE; virtual void OnChannelEstablished() override;
virtual void OnChannelDestroyed() OVERRIDE; virtual void OnChannelDestroyed() override;
private: private:
PlatformWindowDelegate* delegate_; // Not owned. PlatformWindowDelegate* delegate_; // Not owned.
......
...@@ -51,7 +51,7 @@ class NativeWidgetMacInteractiveUITest::Observer : public TestWidgetObserver { ...@@ -51,7 +51,7 @@ class NativeWidgetMacInteractiveUITest::Observer : public TestWidgetObserver {
Observer(NativeWidgetMacInteractiveUITest* parent, Widget* widget) Observer(NativeWidgetMacInteractiveUITest* parent, Widget* widget)
: TestWidgetObserver(widget), parent_(parent) {} : TestWidgetObserver(widget), parent_(parent) {}
virtual void OnWidgetActivationChanged(Widget* widget, bool active) OVERRIDE { virtual void OnWidgetActivationChanged(Widget* widget, bool active) override {
if (active) if (active)
parent_->activationCount_++; parent_->activationCount_++;
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment