| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/run.h" | 5 #include "mojo/shell/run.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "mojo/service_manager/service_manager.h" | 10 #include "mojo/service_manager/service_manager.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 } | 29 } |
| 30 | 30 |
| 31 for (base::CommandLine::StringVector::const_iterator it = args.begin(); | 31 for (base::CommandLine::StringVector::const_iterator it = args.begin(); |
| 32 it != args.end(); ++it) { | 32 it != args.end(); ++it) { |
| 33 GURL url(*it); | 33 GURL url(*it); |
| 34 if (url.scheme() == "mojo" && !command_line.HasSwitch(switches::kOrigin)) { | 34 if (url.scheme() == "mojo" && !command_line.HasSwitch(switches::kOrigin)) { |
| 35 LOG(ERROR) << "mojo: url passed with no --origin specified."; | 35 LOG(ERROR) << "mojo: url passed with no --origin specified."; |
| 36 return; | 36 return; |
| 37 } | 37 } |
| 38 ScopedMessagePipeHandle no_handle; | 38 ScopedMessagePipeHandle no_handle; |
| 39 context->service_manager()->Connect(GURL(*it), no_handle.Pass()); | 39 context->service_manager()->ConnectToService(GURL(*it), no_handle.Pass()); |
| 40 } | 40 } |
| 41 } | 41 } |
| 42 | 42 |
| 43 } // namespace shell | 43 } // namespace shell |
| 44 } // namespace mojo | 44 } // namespace mojo |
| OLD | NEW |