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

Unified Diff: trunk/src/mojo/shell/dbus_service_loader_linux.cc

Issue 447063005: Revert 288013 "First cut at "content handling" support in Mojo." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/mojo/shell/dbus_service_loader_linux.h ('k') | trunk/src/mojo/shell/dynamic_service_loader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/mojo/shell/dbus_service_loader_linux.cc
===================================================================
--- trunk/src/mojo/shell/dbus_service_loader_linux.cc (revision 288042)
+++ trunk/src/mojo/shell/dbus_service_loader_linux.cc (working copy)
@@ -150,15 +150,9 @@
DCHECK(url_to_load_context_.empty());
}
-void DBusServiceLoader::Load(ServiceManager* manager,
- const GURL& url,
- scoped_refptr<LoadCallbacks> callbacks) {
- // TODO(aa): This could be delayed until later, when we know that loading is
- // going to succeed.
- ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
- if (!shell_handle.is_valid())
- return;
-
+void DBusServiceLoader::LoadService(ServiceManager* manager,
+ const GURL& url,
+ ScopedMessagePipeHandle shell_handle) {
DCHECK(url.SchemeIs("dbus"));
DCHECK(url_to_load_context_.find(url) == url_to_load_context_.end());
url_to_load_context_[url] =
« no previous file with comments | « trunk/src/mojo/shell/dbus_service_loader_linux.h ('k') | trunk/src/mojo/shell/dynamic_service_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698