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

Unified Diff: ui/views/mus/mus_client.cc

Issue 2464123003: Enabling Aura-Mus clients to submit frames to Mus. (Closed)
Patch Set: Rebase, addressing feedback, removing some unneded imports/deps. Created 4 years, 1 month 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 | « ui/views/mus/mus_client.h ('k') | ui/views/mus/surface_context_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/mus_client.cc
diff --git a/ui/views/mus/mus_client.cc b/ui/views/mus/mus_client.cc
index 997bbe1e23da10be75d77bc917c54010c024a8b1..6cb463ebfa14ccb594cb8662c2012827d451e726 100644
--- a/ui/views/mus/mus_client.cc
+++ b/ui/views/mus/mus_client.cc
@@ -8,9 +8,9 @@
#include "base/memory/ptr_util.h"
#include "services/service_manager/public/cpp/connection.h"
#include "services/service_manager/public/cpp/connector.h"
-#include "services/ui/public/cpp/gpu_service.h"
#include "services/ui/public/interfaces/event_matcher.mojom.h"
#include "ui/aura/env.h"
+#include "ui/aura/mus/gpu_service.h"
#include "ui/aura/mus/os_exchange_data_provider_mus.h"
#include "ui/aura/mus/property_converter.h"
#include "ui/aura/mus/window_port_mus.h"
@@ -88,7 +88,7 @@ MusClient::MusClient(service_manager::Connector* connector,
wm_state_ = base::MakeUnique<wm::WMState>();
- gpu_service_ = ui::GpuService::Create(connector, std::move(io_task_runner));
+ gpu_service_ = aura::GpuService::Create(connector, std::move(io_task_runner));
compositor_context_factory_ =
base::MakeUnique<views::SurfaceContextFactory>(gpu_service_.get());
aura::Env::GetInstance()->set_context_factory(
« no previous file with comments | « ui/views/mus/mus_client.h ('k') | ui/views/mus/surface_context_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698