diff options
| author | jiayl@chromium.org <jiayl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 00:28:06 +0000 |
|---|---|---|
| committer | jiayl@chromium.org <jiayl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 00:28:06 +0000 |
| commit | badf1c4f73b557bb74e6c0516ec87c712b9350d8 (patch) | |
| tree | cb66c5571e95f94ce28e7da8b8b39392b5dd7dbd /mojo/shell | |
| parent | 96a8fa1b58b726ad19c7b86c28b2770d69fa73f6 (diff) | |
| download | chromium_src-badf1c4f73b557bb74e6c0516ec87c712b9350d8.zip chromium_src-badf1c4f73b557bb74e6c0516ec87c712b9350d8.tar.gz chromium_src-badf1c4f73b557bb74e6c0516ec87c712b9350d8.tar.bz2 | |
Revert 270867 "Mojo: Internalize ServiceConnector<>"
Suspected to cause compile failure on Win Builder:
http://build.chromium.org/p/chromium.win/builders/Win%20Builder/builds/20401
> Mojo: Internalize ServiceConnector<>
>
> Authored by davemoore@chromium.org, see https://codereview.chromium.org/275363002/
>
> R=viettrungluu@chromium.org, darin@chromium.org
>
> Review URL: https://codereview.chromium.org/284113009
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/287003004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell')
| -rw-r--r-- | mojo/shell/view_manager_loader.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mojo/shell/view_manager_loader.cc b/mojo/shell/view_manager_loader.cc index c590dd7..cd24638 100644 --- a/mojo/shell/view_manager_loader.cc +++ b/mojo/shell/view_manager_loader.cc @@ -25,8 +25,10 @@ void ViewManagerLoader::LoadService(ServiceManager* manager, root_node_manager_.reset( new view_manager::service::RootNodeManager(app->shell())); } - app->AddService<view_manager::service::ViewManagerConnection>( - root_node_manager_.get()); + app->AddServiceConnector( + new ServiceConnector<view_manager::service::ViewManagerConnection, + view_manager::service::RootNodeManager>( + root_node_manager_.get())); apps_.push_back(app.release()); } |