| Index: mojo/services/window_manager/window_manager_app.cc
|
| diff --git a/mojo/services/window_manager/window_manager_app.cc b/mojo/services/window_manager/window_manager_app.cc
|
| index 699fd0bd6c6ba44c262a885e33b6b34d59a92180..56eb59878e553332f3ce8fe9af991762128615bc 100644
|
| --- a/mojo/services/window_manager/window_manager_app.cc
|
| +++ b/mojo/services/window_manager/window_manager_app.cc
|
| @@ -150,7 +150,10 @@ bool WindowManagerApp::ConfigureIncomingConnection(
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // WindowManagerApp, ViewManagerDelegate implementation:
|
|
|
| -void WindowManagerApp::OnEmbed(ViewManager* view_manager, Node* root) {
|
| +void WindowManagerApp::OnEmbed(ViewManager* view_manager,
|
| + Node* root,
|
| + ExportedServiceRegistry* exported_services,
|
| + scoped_ptr<ServiceProvider> imported_services) {
|
| DCHECK(!view_manager_ && !root_);
|
| view_manager_ = view_manager;
|
| root_ = root;
|
| @@ -170,8 +173,10 @@ void WindowManagerApp::OnEmbed(ViewManager* view_manager, Node* root) {
|
| focus_client_->AddObserver(this);
|
| activation_client_->AddObserver(this);
|
|
|
| - if (wrapped_delegate_)
|
| - wrapped_delegate_->OnEmbed(view_manager, root);
|
| + if (wrapped_delegate_) {
|
| + wrapped_delegate_->OnEmbed(view_manager, root, exported_services,
|
| + imported_services.Pass());
|
| + }
|
|
|
| for (Connections::const_iterator it = connections_.begin();
|
| it != connections_.end(); ++it) {
|
|
|