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 19 matching lines...) Expand all Loading... |
30 for (CommandLine::StringVector::const_iterator it = args.begin(); | 30 for (CommandLine::StringVector::const_iterator it = args.begin(); |
31 it != args.end(); ++it) { | 31 it != args.end(); ++it) { |
32 GURL url(*it); | 32 GURL url(*it); |
33 if (url.scheme() == "mojo" && !command_line.HasSwitch(switches::kOrigin)) { | 33 if (url.scheme() == "mojo" && !command_line.HasSwitch(switches::kOrigin)) { |
34 LOG(ERROR) << "mojo: url passed with no --origin specified."; | 34 LOG(ERROR) << "mojo: url passed with no --origin specified."; |
35 return; | 35 return; |
36 } | 36 } |
37 ScopedMessagePipeHandle no_handle; | 37 ScopedMessagePipeHandle no_handle; |
38 context->service_manager()->Connect(GURL(*it), no_handle.Pass()); | 38 context->service_manager()->Connect(GURL(*it), no_handle.Pass()); |
39 } | 39 } |
40 // TODO(davemoore): Currently we leak |service_manager|. | |
41 } | 40 } |
42 | 41 |
43 } // namespace shell | 42 } // namespace shell |
44 } // namespace mojo | 43 } // namespace mojo |
OLD | NEW |