| Index: mojo/examples/window_manager/window_manager.cc
|
| diff --git a/mojo/examples/window_manager/window_manager.cc b/mojo/examples/window_manager/window_manager.cc
|
| index 4f0902874d975b5fe2bde9cdbce8f706e554bcaf..f10a61a51b8084c6ebe4dfbca7c7c8efdaae088c 100644
|
| --- a/mojo/examples/window_manager/window_manager.cc
|
| +++ b/mojo/examples/window_manager/window_manager.cc
|
| @@ -337,7 +337,10 @@ class WindowManager
|
| }
|
|
|
| // Overridden from ViewManagerDelegate:
|
| - virtual void OnEmbed(ViewManager* view_manager, Node* root) OVERRIDE {
|
| + virtual void OnEmbed(ViewManager* view_manager,
|
| + Node* root,
|
| + ExportedServiceRegistry* exported_services,
|
| + scoped_ptr<ServiceProvider> imported_services) OVERRIDE {
|
| DCHECK(!view_manager_);
|
| view_manager_ = view_manager;
|
| view_manager_->SetWindowManagerDelegate(this);
|
| @@ -368,7 +371,9 @@ class WindowManager
|
| }
|
|
|
| // Overridden from WindowManagerDelegate:
|
| - virtual void Embed(const String& url) OVERRIDE {
|
| + virtual void Embed(
|
| + const String& url,
|
| + InterfaceRequest<ServiceProvider> service_provider) OVERRIDE {
|
| CreateWindow(url,
|
| NavigationDetailsPtr().Pass(),
|
| ResponseDetailsPtr().Pass());
|
|
|