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

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

Issue 2559343003: mus: Rename GpuService to Gpu. (Closed)
Patch Set: . Created 4 years 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 0bbe77d0a96e2eb63b212a8657cc5e9393ed201f..5cf4487bb5bea87dae24a80e39b37e72241313a5 100644
--- a/ui/views/mus/mus_client.cc
+++ b/ui/views/mus/mus_client.cc
@@ -8,7 +8,7 @@
#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/gpu_service.h"
+#include "services/ui/public/cpp/gpu/gpu.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/interfaces/event_matcher.mojom.h"
#include "services/ui/public/interfaces/window_manager.mojom.h"
@@ -61,7 +61,7 @@ MusClient::~MusClient() {
window_tree_client_.reset();
ui::OSExchangeDataProviderFactory::SetFactory(nullptr);
ui::Clipboard::DestroyClipboardForCurrentThread();
- gpu_service_.reset();
+ gpu_.reset();
if (ViewsDelegate::GetInstance()) {
ViewsDelegate::GetInstance()->set_native_widget_factory(
@@ -179,9 +179,9 @@ MusClient::MusClient(service_manager::Connector* connector,
wm_state_ = base::MakeUnique<wm::WMState>();
- gpu_service_ = ui::GpuService::Create(connector, std::move(io_task_runner));
+ gpu_ = ui::Gpu::Create(connector, std::move(io_task_runner));
compositor_context_factory_ =
- base::MakeUnique<aura::MusContextFactory>(gpu_service_.get());
+ base::MakeUnique<aura::MusContextFactory>(gpu_.get());
aura::Env::GetInstance()->set_context_factory(
compositor_context_factory_.get());
window_tree_client_ =
« 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