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

Side by Side Diff: examples/recursive_content_handler/recursive_content_handler.cc

Issue 2010283006: Almost done: ApplicationDelegate -> ApplicationImplBase conversion. (Closed) Base URL: https://github.com/domokit/mojo.git@work798-x-work797-x-work796_no_run_main_app
Patch Set: rebased Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « examples/native_run_app/native_run_app.cc ('k') | mojo/application/content_handler_factory.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/macros.h" 5 #include "base/macros.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "mojo/application/application_runner_chromium.h"
8 #include "mojo/application/content_handler_factory.h" 7 #include "mojo/application/content_handler_factory.h"
8 #include "mojo/environment/scoped_chromium_init.h"
9 #include "mojo/public/c/system/main.h" 9 #include "mojo/public/c/system/main.h"
10 #include "mojo/public/cpp/application/application_delegate.h" 10 #include "mojo/public/cpp/application/application_impl_base.h"
11 #include "mojo/public/cpp/application/application_impl.h" 11 #include "mojo/public/cpp/application/run_application.h"
12 #include "mojo/public/cpp/application/service_provider_impl.h" 12 #include "mojo/public/cpp/application/service_provider_impl.h"
13 #include "mojo/services/content_handler/interfaces/content_handler.mojom.h" 13 #include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
14 14
15 namespace mojo { 15 namespace mojo {
16 namespace examples { 16 namespace examples {
17 17
18 class RecursiveContentHandler : public ApplicationDelegate, 18 class RecursiveContentHandler : public ApplicationImplBase,
19 public ContentHandlerFactory::ManagedDelegate { 19 public ContentHandlerFactory::ManagedDelegate {
20 public: 20 public:
21 RecursiveContentHandler() {} 21 RecursiveContentHandler() {}
22 22
23 private: 23 private:
24 // Overridden from ApplicationDelegate: 24 // Overridden from ApplicationImplBase:
25 bool ConfigureIncomingConnection( 25 bool OnAcceptConnection(ServiceProviderImpl* service_provider_impl) override {
26 ServiceProviderImpl* service_provider_impl) override {
27 service_provider_impl->AddService<ContentHandler>( 26 service_provider_impl->AddService<ContentHandler>(
28 ContentHandlerFactory::GetInterfaceRequestHandler(this)); 27 ContentHandlerFactory::GetInterfaceRequestHandler(this));
29 return true; 28 return true;
30 } 29 }
31 30
32 // Overridden from ContentHandlerFactory::ManagedDelegate: 31 // Overridden from ContentHandlerFactory::ManagedDelegate:
33 scoped_ptr<ContentHandlerFactory::HandledApplicationHolder> 32 scoped_ptr<ContentHandlerFactory::HandledApplicationHolder>
34 CreateApplication(InterfaceRequest<Application> application_request, 33 CreateApplication(InterfaceRequest<Application> application_request,
35 URLResponsePtr response) override { 34 URLResponsePtr response) override {
36 LOG(INFO) << "RecursiveContentHandler called with url: " << response->url; 35 LOG(INFO) << "RecursiveContentHandler called with url: " << response->url;
37 return make_handled_factory_holder(new mojo::ApplicationImpl( 36 auto app = new RecursiveContentHandler();
38 new RecursiveContentHandler(), application_request.Pass())); 37 app->Bind(application_request.Pass());
38 return make_handled_factory_holder(app);
39 } 39 }
40 40
41 DISALLOW_COPY_AND_ASSIGN(RecursiveContentHandler); 41 DISALLOW_COPY_AND_ASSIGN(RecursiveContentHandler);
42 }; 42 };
43 43
44 } // namespace examples 44 } // namespace examples
45 } // namespace mojo 45 } // namespace mojo
46 46
47 MojoResult MojoMain(MojoHandle application_request) { 47 MojoResult MojoMain(MojoHandle application_request) {
48 mojo::ApplicationRunnerChromium runner( 48 mojo::ScopedChromiumInit init;
49 new mojo::examples::RecursiveContentHandler()); 49 mojo::examples::RecursiveContentHandler recursive_content_handler;
50 return runner.Run(application_request); 50 return mojo::RunApplication(application_request, &recursive_content_handler);
51 } 51 }
OLDNEW
« no previous file with comments | « examples/native_run_app/native_run_app.cc ('k') | mojo/application/content_handler_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698