| Index: mandoline/services/core_services/core_services_application_delegate.cc
|
| diff --git a/mandoline/services/core_services/core_services_application_delegate.cc b/mandoline/services/core_services/core_services_application_delegate.cc
|
| index 5540e74eaa15f8df6ad1de8dd068c31925ede884..b0333fc1967722850c36596e1d9481247d0c4338 100644
|
| --- a/mandoline/services/core_services/core_services_application_delegate.cc
|
| +++ b/mandoline/services/core_services/core_services_application_delegate.cc
|
| @@ -33,7 +33,7 @@ class ApplicationThread : public base::SimpleThread {
|
| core_services_application,
|
| const std::string& url,
|
| scoped_ptr<mojo::ApplicationDelegate> delegate,
|
| - mojo::InterfaceRequest<mojo::Application> request,
|
| + mojo::ApplicationRequest request,
|
| const mojo::Callback<void()>& destruct_callback)
|
| : base::SimpleThread(url),
|
| core_services_application_(core_services_application),
|
| @@ -73,7 +73,7 @@ class ApplicationThread : public base::SimpleThread {
|
| core_services_application_task_runner_;
|
| std::string url_;
|
| scoped_ptr<mojo::ApplicationDelegate> delegate_;
|
| - mojo::InterfaceRequest<mojo::Application> request_;
|
| + mojo::ApplicationRequest request_;
|
| mojo::Callback<void()> destruct_callback_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ApplicationThread);
|
| @@ -117,12 +117,12 @@ void CoreServicesApplicationDelegate::Quit() {
|
|
|
| void CoreServicesApplicationDelegate::Create(
|
| mojo::ApplicationConnection* connection,
|
| - mojo::InterfaceRequest<mojo::ContentHandler> request) {
|
| + mojo::InterfaceRequest<mojo::shell::mojom::ContentHandler> request) {
|
| handler_bindings_.AddBinding(this, std::move(request));
|
| }
|
|
|
| void CoreServicesApplicationDelegate::StartApplication(
|
| - mojo::InterfaceRequest<mojo::Application> request,
|
| + mojo::ApplicationRequest request,
|
| mojo::URLResponsePtr response,
|
| const mojo::Callback<void()>& destruct_callback) {
|
| const std::string url = response->url;
|
|
|