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

Unified Diff: dbus/mock_object_proxy.h

Issue 1055053003: Update {virtual,override} to follow C++11 style in dbus. (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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dbus/mock_object_proxy.h
diff --git a/dbus/mock_object_proxy.h b/dbus/mock_object_proxy.h
index 7c61b47b42802272d40f6f8aadcb6487cd8e2349..66f485ad06ff31c6fa632edde692a5de6808fb41 100644
--- a/dbus/mock_object_proxy.h
+++ b/dbus/mock_object_proxy.h
@@ -29,7 +29,7 @@ class MockObjectProxy : public ObjectProxy {
Response*(MethodCall* method_call,
int timeout_ms,
ScopedDBusError* error));
- virtual scoped_ptr<Response> CallMethodAndBlockWithErrorDetails(
+ scoped_ptr<Response> CallMethodAndBlockWithErrorDetails(
MethodCall* method_call,
int timeout_ms,
ScopedDBusError* error) override {
@@ -38,8 +38,8 @@ class MockObjectProxy : public ObjectProxy {
}
MOCK_METHOD2(MockCallMethodAndBlock, Response*(MethodCall* method_call,
int timeout_ms));
- virtual scoped_ptr<Response> CallMethodAndBlock(MethodCall* method_call,
- int timeout_ms) override {
+ scoped_ptr<Response> CallMethodAndBlock(MethodCall* method_call,
+ int timeout_ms) override {
return scoped_ptr<Response>(MockCallMethodAndBlock(method_call,
timeout_ms));
}
@@ -58,7 +58,7 @@ class MockObjectProxy : public ObjectProxy {
MOCK_METHOD0(Detach, void());
protected:
- virtual ~MockObjectProxy();
+ ~MockObjectProxy() override;
};
} // namespace dbus
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698