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

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

Issue 1081103008: Update {virtual,override} to follow C++11 style in ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/models/tree_node_model.h ('k') | ui/events/event_processor_unittest.cc » ('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 5aa5017c9662b8ab18726f91f36bbe7719a9cb3f..4362b7ed48a24392f91be318762a68374a816d57 100644
--- a/ui/base/resource/resource_bundle_unittest.cc
+++ b/ui/base/resource/resource_bundle_unittest.cc
@@ -59,7 +59,7 @@ class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate {
public:
MockResourceBundleDelegate() {
}
- virtual ~MockResourceBundleDelegate() {
+ ~MockResourceBundleDelegate() override {
}
MOCK_METHOD2(GetPathForResourcePack, base::FilePath(
@@ -76,22 +76,21 @@ class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate {
MOCK_METHOD2(GetRawDataResourceMock, base::StringPiece(
int resource_id,
ui::ScaleFactor scale_factor));
- virtual bool GetRawDataResource(int resource_id,
- ui::ScaleFactor scale_factor,
- base::StringPiece* value) override {
+ bool GetRawDataResource(int resource_id,
+ ui::ScaleFactor scale_factor,
+ 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 {
+ bool GetLocalizedString(int message_id,
+ 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 {
+ scoped_ptr<gfx::Font> GetFont(ui::ResourceBundle::FontStyle style) override {
return make_scoped_ptr(GetFontMock(style));
}
};
« no previous file with comments | « ui/base/models/tree_node_model.h ('k') | ui/events/event_processor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698