| 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/application/public/interfaces/content_handler.mojom.h" |
| 15 #include "mojo/public/cpp/bindings/binding.h" | 15 #include "mojo/public/cpp/bindings/binding.h" |
| 16 #include "mojo/public/cpp/bindings/error_handler.h" | |
| 17 #include "mojo/shell/application_instance.h" | 16 #include "mojo/shell/application_instance.h" |
| 18 #include "mojo/shell/content_handler_connection.h" | 17 #include "mojo/shell/content_handler_connection.h" |
| 19 #include "mojo/shell/fetcher.h" | 18 #include "mojo/shell/fetcher.h" |
| 20 #include "mojo/shell/local_fetcher.h" | 19 #include "mojo/shell/local_fetcher.h" |
| 21 #include "mojo/shell/network_fetcher.h" | 20 #include "mojo/shell/network_fetcher.h" |
| 22 #include "mojo/shell/query_util.h" | 21 #include "mojo/shell/query_util.h" |
| 23 #include "mojo/shell/switches.h" | 22 #include "mojo/shell/switches.h" |
| 24 #include "mojo/shell/update_fetcher.h" | 23 #include "mojo/shell/update_fetcher.h" |
| 25 | 24 |
| 26 namespace mojo { | 25 namespace mojo { |
| (...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 532 request->url = mojo::String::From(application_url.spec()); | 531 request->url = mojo::String::From(application_url.spec()); |
| 533 ConnectToApplication(nullptr, request.Pass(), std::string(), GURL(), | 532 ConnectToApplication(nullptr, request.Pass(), std::string(), GURL(), |
| 534 GetProxy(&services), nullptr, nullptr, base::Closure()); | 533 GetProxy(&services), nullptr, nullptr, base::Closure()); |
| 535 MessagePipe pipe; | 534 MessagePipe pipe; |
| 536 services->ConnectToService(interface_name, pipe.handle1.Pass()); | 535 services->ConnectToService(interface_name, pipe.handle1.Pass()); |
| 537 return pipe.handle0.Pass(); | 536 return pipe.handle0.Pass(); |
| 538 } | 537 } |
| 539 | 538 |
| 540 } // namespace shell | 539 } // namespace shell |
| 541 } // namespace mojo | 540 } // namespace mojo |
| OLD | NEW |