Index: mojo/services/view_manager/root_view_manager.cc |
diff --git a/mojo/services/view_manager/root_view_manager.cc b/mojo/services/view_manager/root_view_manager.cc |
index 791d1b9f712d12663f9a9d30f395f7bcdca7deaf..2721fed99ba4f438a616e4bb677dae3aad25c8c4 100644 |
--- a/mojo/services/view_manager/root_view_manager.cc |
+++ b/mojo/services/view_manager/root_view_manager.cc |
@@ -7,7 +7,7 @@ |
#include "base/auto_reset.h" |
#include "mojo/aura/screen_mojo.h" |
#include "mojo/aura/window_tree_host_mojo.h" |
-#include "mojo/public/cpp/bindings/allocation_scope.h" |
+#include "mojo/public/cpp/shell/service.h" |
#include "mojo/public/interfaces/shell/shell.mojom.h" |
#include "mojo/services/view_manager/root_node_manager.h" |
#include "ui/aura/client/default_capture_client.h" |
@@ -53,12 +53,10 @@ RootViewManager::RootViewManager(Shell* shell, RootNodeManager* root_node) |
in_setup_(false) { |
screen_.reset(ScreenMojo::Create()); |
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get()); |
- InterfacePipe<NativeViewport, AnyInterface> pipe; |
- mojo::AllocationScope scope; |
- shell_->Connect("mojo:mojo_native_viewport_service", |
- pipe.handle_to_peer.Pass()); |
+ NativeViewportPtr viewport; |
+ ConnectTo(shell, "mojo:mojo_native_viewport_service", &viewport); |
window_tree_host_.reset(new WindowTreeHostMojo( |
- pipe.handle_to_self.Pass(), |
+ viewport.Pass(), |
gfx::Rect(800, 600), |
base::Bind(&RootViewManager::OnCompositorCreated, |
base::Unretained(this)))); |