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

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

Issue 868463008: Remove Client relationship between mojo.Shell/mojo.Application (Closed) Base URL: git@github.com:domokit/mojo.git@app_impl_init
Patch Set: fix android Created 5 years, 11 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
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" 7 #include "mojo/application/application_runner_chromium.h"
8 #include "mojo/application/content_handler_factory.h" 8 #include "mojo/application/content_handler_factory.h"
9 #include "mojo/public/c/system/main.h" 9 #include "mojo/public/c/system/main.h"
10 #include "mojo/public/cpp/application/application_connection.h" 10 #include "mojo/public/cpp/application/application_connection.h"
(...skipping 13 matching lines...) Expand all
24 private: 24 private:
25 // Overridden from ApplicationDelegate: 25 // Overridden from ApplicationDelegate:
26 virtual bool ConfigureIncomingConnection( 26 virtual bool ConfigureIncomingConnection(
27 ApplicationConnection* connection) override { 27 ApplicationConnection* connection) override {
28 connection->AddService(&content_handler_factory_); 28 connection->AddService(&content_handler_factory_);
29 return true; 29 return true;
30 } 30 }
31 31
32 // Overridden from ContentHandlerFactory::ManagedDelegate: 32 // Overridden from ContentHandlerFactory::ManagedDelegate:
33 virtual scoped_ptr<ContentHandlerFactory::HandledApplicationHolder> 33 virtual scoped_ptr<ContentHandlerFactory::HandledApplicationHolder>
34 CreateApplication(ShellPtr shell, URLResponsePtr response) override { 34 CreateApplication(InterfaceRequest<Application> application_request,
35 URLResponsePtr response) override {
35 LOG(INFO) << "RecursiveContentHandler called with url: " << response->url; 36 LOG(INFO) << "RecursiveContentHandler called with url: " << response->url;
36 return make_handled_factory_holder( 37 return make_handled_factory_holder(new mojo::ApplicationImpl(
37 new mojo::ApplicationImpl(new RecursiveContentHandler(), shell.Pass())); 38 new RecursiveContentHandler(), application_request.Pass()));
38 } 39 }
39 40
40 ContentHandlerFactory content_handler_factory_; 41 ContentHandlerFactory content_handler_factory_;
41 42
42 DISALLOW_COPY_AND_ASSIGN(RecursiveContentHandler); 43 DISALLOW_COPY_AND_ASSIGN(RecursiveContentHandler);
43 }; 44 };
44 45
45 } // namespace examples 46 } // namespace examples
46 } // namespace mojo 47 } // namespace mojo
47 48
48 MojoResult MojoMain(MojoHandle shell_handle) { 49 MojoResult MojoMain(MojoHandle shell_handle) {
49 mojo::ApplicationRunnerChromium runner( 50 mojo::ApplicationRunnerChromium runner(
50 new mojo::examples::RecursiveContentHandler()); 51 new mojo::examples::RecursiveContentHandler());
51 return runner.Run(shell_handle); 52 return runner.Run(shell_handle);
52 } 53 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698