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

Side by Side Diff: trunk/src/mojo/public/cpp/shell/lib/application.cc

Issue 304593002: Revert 272983 "Change Shell / ShellClient to ServiceProvider" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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 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/public/cpp/shell/application.h" 5 #include "mojo/public/cpp/shell/application.h"
6 6
7 namespace mojo { 7 namespace mojo {
8 8
9 Application::Application(ScopedMessagePipeHandle shell_handle) 9 Application::Application(ScopedMessagePipeHandle shell_handle)
10 : internal::ServiceConnectorBase::Owner(shell_handle.Pass()) { 10 : internal::ServiceConnectorBase::Owner(shell_handle.Pass()) {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 ScopedMessagePipeHandle client_handle) { 45 ScopedMessagePipeHandle client_handle) {
46 // TODO(davemoore): This method must be overridden by an Application subclass 46 // TODO(davemoore): This method must be overridden by an Application subclass
47 // to dispatch to the right ServiceConnector. We need to figure out an 47 // to dispatch to the right ServiceConnector. We need to figure out an
48 // approach to registration to make this better. 48 // approach to registration to make this better.
49 assert(1 == service_connectors_.size()); 49 assert(1 == service_connectors_.size());
50 return service_connectors_.front()->AcceptConnection(url.To<std::string>(), 50 return service_connectors_.front()->AcceptConnection(url.To<std::string>(),
51 client_handle.Pass()); 51 client_handle.Pass());
52 } 52 }
53 53
54 } // namespace mojo 54 } // namespace mojo
OLDNEW
« no previous file with comments | « trunk/src/mojo/public/cpp/shell/connect.h ('k') | trunk/src/mojo/public/cpp/shell/lib/service_connector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698