Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(696)

Side by Side Diff: mojo/shell/run.cc

Issue 298653010: Change Shell / ShellClient to ServiceProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Support content Mojo stuff Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 17 matching lines...) Expand all
28 } 28 }
29 29
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()->ConnectToService(GURL(*it), no_handle.Pass());
39 } 39 }
40 } 40 }
41 41
42 } // namespace shell 42 } // namespace shell
43 } // namespace mojo 43 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698