Skip to content

Commit

Permalink
Update {virtual,override,final} for ui/ to follow C++11 style.
Browse files Browse the repository at this point in the history
This patch was automatically generated using a variation of
https://codereview.chromium.org/598073004 on a Mac build.

BUG=417463

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

Cr-Commit-Position: refs/heads/master@{#310676}
  • Loading branch information
zetafunction authored and Commit bot committed Jan 9, 2015
1 parent 8fd9f38 commit 3d8f250
Show file tree
Hide file tree
Showing 18 changed files with 27 additions and 32 deletions.
4 changes: 2 additions & 2 deletions ui/app_list/cocoa/app_list_view_controller_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
public:
AppListViewControllerTest() {}

virtual void SetUp() override {
void SetUp() override {
app_list_view_controller_.reset([[AppListViewController alloc] init]);
delegate_.reset(new AppListTestViewDelegate);
[app_list_view_controller_ setDelegate:delegate_.get()];
SetUpWithGridController([app_list_view_controller_ appsGridController]);
[[test_window() contentView] addSubview:[app_list_view_controller_ view]];
}

virtual void TearDown() override {
void TearDown() override {
[app_list_view_controller_ setDelegate:NULL];
app_list_view_controller_.reset();
AppsGridControllerTestHelper::TearDown();
Expand Down
2 changes: 1 addition & 1 deletion ui/app_list/cocoa/app_list_window_controller_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
AppListWindowControllerTest();

protected:
virtual void TearDown() override;
void TearDown() override;

base::scoped_nsobject<AppListWindowController> controller_;

Expand Down
4 changes: 2 additions & 2 deletions ui/app_list/cocoa/apps_grid_controller_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ - (NSInteger)pagerSegmentAtLocation:(NSPoint)locationInWindow {
return [attributes objectForKey:NSForegroundColorAttributeName];
}

virtual void SetUp() override {
void SetUp() override {
owned_apps_grid_controller_.reset([[AppsGridController alloc] init]);
owned_delegate_.reset(new AppListTestViewDelegate);
[owned_apps_grid_controller_ setDelegate:owned_delegate_.get()];
Expand All @@ -108,7 +108,7 @@ virtual void SetUp() override {
[apps_grid_controller_ collectionViewAtPageIndex:0]];
}

virtual void TearDown() override {
void TearDown() override {
[owned_apps_grid_controller_ setDelegate:NULL];
owned_apps_grid_controller_.reset();
AppsGridControllerTestHelper::TearDown();
Expand Down
4 changes: 2 additions & 2 deletions ui/app_list/cocoa/apps_search_box_controller_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ - (CGFloat)bubbleCornerRadius {
Init();
}

virtual void SetUp() override {
void SetUp() override {
apps_search_box_controller_.reset(
[[AppsSearchBoxController alloc] initWithFrame:
NSMakeRect(0, 0, 400, 100)]);
Expand All @@ -99,7 +99,7 @@ virtual void SetUp() override {
[[test_window() contentView] addSubview:[apps_search_box_controller_ view]];
}

virtual void TearDown() override {
void TearDown() override {
[apps_search_box_controller_ setDelegate:nil];
ui::CocoaTest::TearDown();
}
Expand Down
4 changes: 2 additions & 2 deletions ui/app_list/cocoa/apps_search_results_controller_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ BOOL SimulateKeyAction(SEL c) {
void ExpectConsistent();

// ui::CocoaTest overrides:
virtual void SetUp() override;
virtual void TearDown() override;
void SetUp() override;
void TearDown() override;

protected:
base::scoped_nsobject<TestAppsSearchResultsDelegate> delegate_;
Expand Down
2 changes: 1 addition & 1 deletion ui/app_list/cocoa/test/apps_grid_controller_test_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class AppsGridControllerTestHelper : public ui::CocoaTest {
static const size_t kItemsPerPage;

AppsGridControllerTestHelper();
virtual ~AppsGridControllerTestHelper();
~AppsGridControllerTestHelper() override;

void SetUpWithGridController(AppsGridController* grid_controller);

Expand Down
2 changes: 1 addition & 1 deletion ui/base/cocoa/controls/blue_label_button_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
BlueLabelButtonTest() {}

// ui::CocoaTest override:
virtual void SetUp() override;
void SetUp() override;

protected:
base::scoped_nsobject<BlueLabelButton> blue_label_button_;
Expand Down
2 changes: 1 addition & 1 deletion ui/base/cocoa/controls/hover_image_menu_button_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
HoverImageMenuButtonTest() {}

// CocoaTest override:
virtual void SetUp() override;
void SetUp() override;

protected:
base::scoped_nsobject<HoverImageMenuButton> menu_button_;
Expand Down
2 changes: 1 addition & 1 deletion ui/base/cocoa/focus_tracker_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class FocusTrackerTest : public ui::CocoaTest {
public:
virtual void SetUp() {
void SetUp() override {
ui::CocoaTest::SetUp();
base::scoped_nsobject<NSView> view(
[[NSView alloc] initWithFrame:NSZeroRect]);
Expand Down
2 changes: 1 addition & 1 deletion ui/gfx/color_profile_mac_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class ColorProfileTest : public ui::CocoaTest {
public:
virtual void SetUp() override {
void SetUp() override {
ui::CocoaTest::SetUp();

// Verify the primary screen origin.
Expand Down
3 changes: 0 additions & 3 deletions ui/gfx/image/image_mac_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ void BitmapImageRep(int width, int height,
gfx::ImageSkia::SetSupportedScales(gfx::test::Get1xAnd2xScales());
}

virtual ~ImageMacTest() {
}

private:
DISALLOW_COPY_AND_ASSIGN(ImageMacTest);
};
Expand Down
4 changes: 2 additions & 2 deletions ui/gfx/mac/coordinate_conversion_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ - (NSRect)frame {
MacCoordinateConversionTest() {}

// Overridden from testing::Test:
virtual void SetUp() override;
virtual void TearDown() override;
void SetUp() override;
void TearDown() override;

private:
scoped_ptr<base::mac::ScopedObjCClassSwizzler> swizzle_frame_;
Expand Down
2 changes: 1 addition & 1 deletion ui/gfx/screen_mac.mm
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
ScreenMac::DisplayReconfigurationCallBack, this);
}

virtual ~ScreenMac() {
~ScreenMac() override {
CGDisplayRemoveReconfigurationCallback(
ScreenMac::DisplayReconfigurationCallBack, this);
}
Expand Down
4 changes: 2 additions & 2 deletions ui/gfx/test/ui_cocoa_test_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ namespace ui {
class CocoaTest : public PlatformTest {
public:
CocoaTest();
virtual ~CocoaTest();
~CocoaTest() override;

// Must be called by subclasses that override TearDown. We verify that it
// is called in our destructor. Takes care of making sure that all windows
// are closed off correctly. If your tests open windows, they must be sure
// to close them before CocoaTest::TearDown is called. A standard way of doing
// this would be to create them in SetUp (after calling CocoaTest::Setup) and
// then close them in TearDown before calling CocoaTest::TearDown.
virtual void TearDown() override;
void TearDown() override;

// Retuns a test window that can be used by views and other UI objects
// as part of their tests. Is created lazily, and will be closed correctly
Expand Down
6 changes: 2 additions & 4 deletions ui/message_center/cocoa/popup_collection_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,12 @@
}];
}

virtual void TearDown() override {
void TearDown() override {
collection_.reset(); // Close all popups.
ui::CocoaTest::TearDown();
}

virtual ~PopupCollectionTest() {
message_center::MessageCenter::Shutdown();
}
~PopupCollectionTest() override { message_center::MessageCenter::Shutdown(); }

message_center::NotifierId DummyNotifierId() {
return message_center::NotifierId();
Expand Down
4 changes: 2 additions & 2 deletions ui/message_center/cocoa/status_item_view_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
: view_([[MCStatusItemView alloc] init]) {
}

virtual void SetUp() override {
void SetUp() override {
ui::CocoaTest::SetUp();
[[test_window() contentView] addSubview:view_];
}

virtual void TearDown() override {
void TearDown() override {
[view_ removeItem];
ui::CocoaTest::TearDown();
}
Expand Down
4 changes: 2 additions & 2 deletions ui/message_center/cocoa/tray_controller_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class TrayControllerTest : public ui::CocoaTest {
public:
virtual void SetUp() override {
void SetUp() override {
ui::CocoaTest::SetUp();
message_center::MessageCenter::Initialize();
tray_.reset(new message_center::MessageCenterTray(
Expand All @@ -23,7 +23,7 @@ virtual void SetUp() override {
[[MCTrayController alloc] initWithMessageCenterTray:tray_.get()]);
}

virtual void TearDown() override {
void TearDown() override {
controller_.reset();
tray_.reset();
message_center::MessageCenter::Shutdown();
Expand Down
4 changes: 2 additions & 2 deletions ui/message_center/cocoa/tray_view_controller_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
: center_(NULL) {
}

virtual void SetUp() override {
void SetUp() override {
ui::CocoaTest::SetUp();
message_center::MessageCenter::Initialize();
center_ = message_center::MessageCenter::Get();
Expand All @@ -41,7 +41,7 @@ virtual void SetUp() override {
[tray_ view]; // Create the view.
}

virtual void TearDown() override {
void TearDown() override {
tray_.reset();
message_center::MessageCenter::Shutdown();
ui::CocoaTest::TearDown();
Expand Down

0 comments on commit 3d8f250

Please sign in to comment.