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

Side by Side Diff: services/http_server/http_server_app.cc

Issue 1517743003: Make ApplicationRunner's ctor's ApplicationDelegate* argument an std::unique_ptr instead. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years 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 unified diff | Download patch
« no previous file with comments | « services/device_info/device_info.cc ('k') | services/nacl/nonsfi/pnacl_compile.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/memory/scoped_ptr.h" 5 #include <memory>
6
6 #include "mojo/public/c/system/main.h" 7 #include "mojo/public/c/system/main.h"
7 #include "mojo/public/cpp/application/application_delegate.h" 8 #include "mojo/public/cpp/application/application_delegate.h"
8 #include "mojo/public/cpp/application/application_impl.h" 9 #include "mojo/public/cpp/application/application_impl.h"
9 #include "mojo/public/cpp/application/application_runner.h" 10 #include "mojo/public/cpp/application/application_runner.h"
10 #include "mojo/public/cpp/application/interface_factory.h" 11 #include "mojo/public/cpp/application/interface_factory.h"
11 #include "mojo/services/http_server/interfaces/http_server_factory.mojom.h" 12 #include "mojo/services/http_server/interfaces/http_server_factory.mojom.h"
12 #include "services/http_server/http_server_factory_impl.h" 13 #include "services/http_server/http_server_factory_impl.h"
13 #include "services/http_server/http_server_impl.h" 14 #include "services/http_server/http_server_impl.h"
14 15
15 namespace http_server { 16 namespace http_server {
(...skipping 18 matching lines...) Expand all
34 void Create(mojo::ApplicationConnection* connection, 35 void Create(mojo::ApplicationConnection* connection,
35 mojo::InterfaceRequest<HttpServerFactory> request) override { 36 mojo::InterfaceRequest<HttpServerFactory> request) override {
36 if (!http_server_factory_) { 37 if (!http_server_factory_) {
37 http_server_factory_.reset(new HttpServerFactoryImpl(app_)); 38 http_server_factory_.reset(new HttpServerFactoryImpl(app_));
38 } 39 }
39 40
40 http_server_factory_->AddBinding(request.Pass()); 41 http_server_factory_->AddBinding(request.Pass());
41 } 42 }
42 43
43 mojo::ApplicationImpl* app_; 44 mojo::ApplicationImpl* app_;
44 scoped_ptr<HttpServerFactoryImpl> http_server_factory_; 45 std::unique_ptr<HttpServerFactoryImpl> http_server_factory_;
45 }; 46 };
46 47
47 } // namespace http_server 48 } // namespace http_server
48 49
49 MojoResult MojoMain(MojoHandle application_request) { 50 MojoResult MojoMain(MojoHandle application_request) {
50 mojo::ApplicationRunner runner(new http_server::HttpServerApp); 51 mojo::ApplicationRunner runner(std::unique_ptr<http_server::HttpServerApp>(
52 new http_server::HttpServerApp()));
51 return runner.Run(application_request); 53 return runner.Run(application_request);
52 } 54 }
OLDNEW
« no previous file with comments | « services/device_info/device_info.cc ('k') | services/nacl/nonsfi/pnacl_compile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698