| 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 2b73375077cc9c02a2aec1ac497e2b54aeea1796..d44535dc5781089740b266e927fc523df219836a 100644
|
| --- a/mojo/services/view_manager/root_view_manager.cc
|
| +++ b/mojo/services/view_manager/root_view_manager.cc
|
| @@ -7,7 +7,6 @@
|
| #include "base/auto_reset.h"
|
| #include "base/scoped_observer.h"
|
| #include "mojo/public/cpp/application/application_connection.h"
|
| -#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
|
| #include "mojo/services/view_manager/root_node_manager.h"
|
| #include "mojo/services/view_manager/root_view_manager_delegate.h"
|
| #include "mojo/services/view_manager/screen_impl.h"
|
| @@ -82,18 +81,14 @@
|
| NativeViewportPtr viewport;
|
| app_connection->ConnectToService(
|
| "mojo:mojo_native_viewport_service", &viewport);
|
| - GpuPtr gpu_service;
|
| - // TODO(jamesr): Should be mojo:mojo_gpu_service
|
| - app_connection->ConnectToService("mojo:mojo_native_viewport_service",
|
| - &gpu_service);
|
| window_tree_host_.reset(new WindowTreeHostImpl(
|
| - viewport.Pass(),
|
| - gpu_service.Pass(),
|
| - gfx::Rect(800, 600),
|
| - base::Bind(&RootViewManager::OnCompositorCreated, base::Unretained(this)),
|
| - native_viewport_closed_callback,
|
| - base::Bind(&RootNodeManager::DispatchNodeInputEventToWindowManager,
|
| - base::Unretained(root_node_manager_))));
|
| + viewport.Pass(),
|
| + gfx::Rect(800, 600),
|
| + base::Bind(&RootViewManager::OnCompositorCreated,
|
| + base::Unretained(this)),
|
| + native_viewport_closed_callback,
|
| + base::Bind(&RootNodeManager::DispatchNodeInputEventToWindowManager,
|
| + base::Unretained(root_node_manager_))));
|
| }
|
|
|
| RootViewManager::~RootViewManager() {
|
|
|