Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(414)

Unified Diff: ui/base/resource/resource_bundle_unittest.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/resource/resource_bundle.cc ('k') | ui/base/resource/resource_data_dll_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_unittest.cc
diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc
index 6a3f71e7c51269561faa32ee8babbf481a639c8e..488947dbc8f8be5bb1067e830662b3c5b900d624 100644
--- a/ui/base/resource/resource_bundle_unittest.cc
+++ b/ui/base/resource/resource_bundle_unittest.cc
@@ -77,20 +77,20 @@ class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate {
ui::ScaleFactor scale_factor));
virtual bool GetRawDataResource(int resource_id,
ui::ScaleFactor scale_factor,
- base::StringPiece* value) OVERRIDE {
+ base::StringPiece* value) override {
*value = GetRawDataResourceMock(resource_id, scale_factor);
return true;
}
MOCK_METHOD1(GetLocalizedStringMock, base::string16(int message_id));
virtual bool GetLocalizedString(int message_id,
- base::string16* value) OVERRIDE {
+ base::string16* value) override {
*value = GetLocalizedStringMock(message_id);
return true;
}
MOCK_METHOD1(GetFontMock,
gfx::Font*(ui::ResourceBundle::FontStyle style));
virtual scoped_ptr<gfx::Font> GetFont(
- ui::ResourceBundle::FontStyle style) OVERRIDE {
+ ui::ResourceBundle::FontStyle style) override {
return scoped_ptr<gfx::Font>(GetFontMock(style));
}
};
@@ -153,7 +153,7 @@ class ResourceBundleTest : public testing::Test {
}
// Overridden from testing::Test:
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
delete resource_bundle_;
}
@@ -383,7 +383,7 @@ class ResourceBundleImageTest : public ResourceBundleTest {
virtual ~ResourceBundleImageTest() {
}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
// Create a temporary directory to write test resource bundles to.
ASSERT_TRUE(dir_.CreateUniqueTempDir());
}
« no previous file with comments | « ui/base/resource/resource_bundle.cc ('k') | ui/base/resource/resource_data_dll_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698