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

Unified Diff: mojo/service_manager/background_shell_service_loader.h

Issue 423963004: First cut at "content handling" support in Mojo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more gn 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 | « mojo/service_manager/BUILD.gn ('k') | mojo/service_manager/background_shell_service_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/service_manager/background_shell_service_loader.h
diff --git a/mojo/service_manager/background_shell_service_loader.h b/mojo/service_manager/background_shell_service_loader.h
index 3f4b3fc5687997efc67bfd4e0adf8cbc3203bb27..a28b33f4ce915e049f2173d6f85b78e6d17fb925 100644
--- a/mojo/service_manager/background_shell_service_loader.h
+++ b/mojo/service_manager/background_shell_service_loader.h
@@ -26,9 +26,9 @@ class MOJO_SERVICE_MANAGER_EXPORT BackgroundShellServiceLoader :
virtual ~BackgroundShellServiceLoader();
// ServiceLoader overrides:
- virtual void LoadService(ServiceManager* manager,
- const GURL& url,
- ScopedMessagePipeHandle shell_handle) OVERRIDE;
+ virtual void Load(ServiceManager* manager,
+ const GURL& url,
+ scoped_refptr<LoadCallbacks> callbacks) OVERRIDE;
virtual void OnServiceError(ServiceManager* manager,
const GURL& url) OVERRIDE;
@@ -42,10 +42,9 @@ class MOJO_SERVICE_MANAGER_EXPORT BackgroundShellServiceLoader :
// to |background_loader_| to do the actual loading.
// TODO: having this code take a |manager| is fragile (as ServiceManager isn't
// thread safe).
- void LoadServiceOnBackgroundThread(
- ServiceManager* manager,
- const GURL& url,
- ScopedMessagePipeHandle* shell_handle);
+ void LoadOnBackgroundThread(ServiceManager* manager,
+ const GURL& url,
+ ScopedMessagePipeHandle* shell_handle);
void OnServiceErrorOnBackgroundThread(ServiceManager* manager,
const GURL& url);
bool quit_on_shutdown_;
« no previous file with comments | « mojo/service_manager/BUILD.gn ('k') | mojo/service_manager/background_shell_service_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698