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/shell/application_manager.h" | 5 #include "mojo/shell/application_manager.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
13 #include "base/trace_event/trace_event.h" | 13 #include "base/trace_event/trace_event.h" |
| 14 #include "mojo/application/public/interfaces/content_handler.mojom.h" |
14 #include "mojo/public/cpp/bindings/binding.h" | 15 #include "mojo/public/cpp/bindings/binding.h" |
15 #include "mojo/public/cpp/bindings/error_handler.h" | 16 #include "mojo/public/cpp/bindings/error_handler.h" |
16 #include "mojo/shell/fetcher.h" | 17 #include "mojo/shell/fetcher.h" |
17 #include "mojo/shell/local_fetcher.h" | 18 #include "mojo/shell/local_fetcher.h" |
18 #include "mojo/shell/network_fetcher.h" | 19 #include "mojo/shell/network_fetcher.h" |
19 #include "mojo/shell/query_util.h" | 20 #include "mojo/shell/query_util.h" |
20 #include "mojo/shell/shell_impl.h" | 21 #include "mojo/shell/shell_impl.h" |
21 #include "mojo/shell/switches.h" | 22 #include "mojo/shell/switches.h" |
22 #include "third_party/mojo_services/src/content_handler/public/interfaces/conten
t_handler.mojom.h" | |
23 | 23 |
24 namespace mojo { | 24 namespace mojo { |
25 namespace shell { | 25 namespace shell { |
26 | 26 |
27 namespace { | 27 namespace { |
28 | 28 |
29 // Used by TestAPI. | 29 // Used by TestAPI. |
30 bool has_created_instance = false; | 30 bool has_created_instance = false; |
31 | 31 |
32 } // namespace | 32 } // namespace |
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
522 return pipe.handle0.Pass(); | 522 return pipe.handle0.Pass(); |
523 } | 523 } |
524 | 524 |
525 void ApplicationManager::CleanupRunner(NativeRunner* runner) { | 525 void ApplicationManager::CleanupRunner(NativeRunner* runner) { |
526 native_runners_.erase( | 526 native_runners_.erase( |
527 std::find(native_runners_.begin(), native_runners_.end(), runner)); | 527 std::find(native_runners_.begin(), native_runners_.end(), runner)); |
528 } | 528 } |
529 | 529 |
530 } // namespace shell | 530 } // namespace shell |
531 } // namespace mojo | 531 } // namespace mojo |
OLD | NEW |