| Index: mojo/shell/ui_service_loader_android.h
|
| diff --git a/mojo/shell/ui_service_loader_android.h b/mojo/shell/ui_service_loader_android.h
|
| index ebe6df9800ab2f97405e33bf659296ce6bcf13fa..4eba373fb04d9f0b74cb3c2de62f8637de00e42d 100644
|
| --- a/mojo/shell/ui_service_loader_android.h
|
| +++ b/mojo/shell/ui_service_loader_android.h
|
| @@ -25,9 +25,10 @@ class UIServiceLoader : public ServiceLoader {
|
| virtual ~UIServiceLoader();
|
|
|
| // ServiceLoader overrides:
|
| - virtual void LoadService(ServiceManager* manager,
|
| - const GURL& url,
|
| - ScopedMessagePipeHandle shell_handle) OVERRIDE;
|
| + virtual void LoadService(
|
| + ServiceManager* manager,
|
| + const GURL& url,
|
| + scoped_refptr<LoadServiceCallbacks> callbacks) OVERRIDE;
|
| virtual void OnServiceError(ServiceManager* manager,
|
| const GURL& url) OVERRIDE;
|
|
|
| @@ -40,7 +41,7 @@ class UIServiceLoader : public ServiceLoader {
|
| // thread safe).
|
| void LoadServiceOnUIThread(ServiceManager* manager,
|
| const GURL& url,
|
| - ScopedMessagePipeHandle* shell_handle);
|
| + ScopedMessagePipeHandle shell_handle);
|
| void OnServiceErrorOnUIThread(ServiceManager* manager, const GURL& url);
|
| void ShutdownOnUIThread();
|
|
|
|
|