OLD | NEW |
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 "mojo/application/content_handler_factory.h" | 5 #include "mojo/application/public/cpp/content_handler_factory.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
12 #include "base/threading/platform_thread.h" | 12 #include "base/threading/platform_thread.h" |
13 #include "mojo/application/application_runner_chromium.h" | |
14 #include "mojo/application/public/cpp/application_connection.h" | 13 #include "mojo/application/public/cpp/application_connection.h" |
15 #include "mojo/application/public/cpp/application_delegate.h" | 14 #include "mojo/application/public/cpp/application_delegate.h" |
16 #include "mojo/application/public/cpp/application_impl.h" | 15 #include "mojo/application/public/cpp/application_impl.h" |
| 16 #include "mojo/application/public/cpp/application_runner.h" |
17 #include "mojo/application/public/cpp/interface_factory_impl.h" | 17 #include "mojo/application/public/cpp/interface_factory_impl.h" |
18 #include "mojo/common/message_pump_mojo.h" | 18 #include "mojo/common/message_pump_mojo.h" |
19 #include "mojo/public/cpp/bindings/strong_binding.h" | 19 #include "mojo/public/cpp/bindings/strong_binding.h" |
20 | 20 |
21 namespace mojo { | 21 namespace mojo { |
22 | 22 |
23 namespace { | 23 namespace { |
24 | 24 |
25 class ApplicationThread : public base::PlatformThread::Delegate { | 25 class ApplicationThread : public base::PlatformThread::Delegate { |
26 public: | 26 public: |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 if (application) | 121 if (application) |
122 loop.Run(); | 122 loop.Run(); |
123 } | 123 } |
124 | 124 |
125 void ContentHandlerFactory::Create(ApplicationConnection* connection, | 125 void ContentHandlerFactory::Create(ApplicationConnection* connection, |
126 InterfaceRequest<ContentHandler> request) { | 126 InterfaceRequest<ContentHandler> request) { |
127 new ContentHandlerImpl(delegate_, request.Pass()); | 127 new ContentHandlerImpl(delegate_, request.Pass()); |
128 } | 128 } |
129 | 129 |
130 } // namespace mojo | 130 } // namespace mojo |
OLD | NEW |