Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(584)

Unified Diff: mojo/services/view_manager/root_view_manager.cc

Issue 480723002: Revert of Mojo multiple command buffer support and sample (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/services/view_manager/DEPS ('k') | mojo/services/view_manager/window_tree_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « mojo/services/view_manager/DEPS ('k') | mojo/services/view_manager/window_tree_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698