| Index: ui/views/cocoa/bridged_native_widget_unittest.mm
|
| diff --git a/ui/views/cocoa/bridged_native_widget_unittest.mm b/ui/views/cocoa/bridged_native_widget_unittest.mm
|
| index 96fc1f974662a520ab191cfc7340992d530343ab..0ca3ec10dd4f3df7c4c5dd943ec65b87e514ba39 100644
|
| --- a/ui/views/cocoa/bridged_native_widget_unittest.mm
|
| +++ b/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_;
|
|
|