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

Unified Diff: examples/surfaces_app/child_gl_app.cc

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 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 | « examples/surfaces_app/child_app.cc ('k') | examples/wget/wget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/surfaces_app/child_gl_app.cc
diff --git a/examples/surfaces_app/child_gl_app.cc b/examples/surfaces_app/child_gl_app.cc
index 5630b2428b5027d4ea9550c5b71b7a0ff3fc43b8..77c85617cd554db9512a809a66e30152e70ebef9 100644
--- a/examples/surfaces_app/child_gl_app.cc
+++ b/examples/surfaces_app/child_gl_app.cc
@@ -19,9 +19,9 @@ namespace examples {
class ChildGLApp : public ApplicationDelegate, public InterfaceFactory<Child> {
public:
ChildGLApp() {}
- virtual ~ChildGLApp() {}
+ ~ChildGLApp() override {}
- virtual void Initialize(ApplicationImpl* app) override {
+ void Initialize(ApplicationImpl* app) override {
surfaces_service_connection_ =
app->ConnectToApplication("mojo:surfaces_service");
// TODO(jamesr): Should be mojo:gpu_service
@@ -29,15 +29,15 @@ class ChildGLApp : public ApplicationDelegate, public InterfaceFactory<Child> {
}
// ApplicationDelegate implementation.
- virtual bool ConfigureIncomingConnection(
+ bool ConfigureIncomingConnection(
ApplicationConnection* connection) override {
connection->AddService(this);
return true;
}
// InterfaceFactory<Child> implementation.
- virtual void Create(ApplicationConnection* connection,
- InterfaceRequest<Child> request) override {
+ void Create(ApplicationConnection* connection,
+ InterfaceRequest<Child> request) override {
CommandBufferPtr command_buffer;
gpu_service_->CreateOffscreenGLES2Context(GetProxy(&command_buffer));
new ChildGLImpl(surfaces_service_connection_, command_buffer.Pass(),
« no previous file with comments | « examples/surfaces_app/child_app.cc ('k') | examples/wget/wget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698