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

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

Issue 2644093002: aura: Some change to how the client-lib is set up. (Closed)
Patch Set: . Created 3 years, 11 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 | « ui/views/mus/mus_client.h ('k') | no next file » | 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 1ac3a789bc6bd5e1840f07b632a17958003253d3..2a73231972a333202e7dd245ed9ec78d49577652 100644
--- a/ui/views/mus/mus_client.cc
+++ b/ui/views/mus/mus_client.cc
@@ -90,13 +90,9 @@ MusClient::MusClient(service_manager::Connector* connector,
base::DiscardableMemoryAllocator::SetInstance(
discardable_shared_memory_manager_.get());
- gpu_ = ui::Gpu::Create(connector, std::move(io_task_runner));
- compositor_context_factory_ =
- base::MakeUnique<aura::MusContextFactory>(gpu_.get());
- aura::Env::GetInstance()->set_context_factory(
- compositor_context_factory_.get());
- window_tree_client_ =
- base::MakeUnique<aura::WindowTreeClient>(connector, this);
+ window_tree_client_ = base::MakeUnique<aura::WindowTreeClient>(
+ connector, this, nullptr /* window_manager_delegate */,
+ nullptr /* window_tree_client_request */, std::move(io_task_runner));
aura::Env::GetInstance()->SetWindowTreeClient(window_tree_client_.get());
window_tree_client_->ConnectViaWindowTreeFactory();
@@ -122,7 +118,6 @@ MusClient::~MusClient() {
window_tree_client_.reset();
ui::OSExchangeDataProviderFactory::SetFactory(nullptr);
ui::Clipboard::DestroyClipboardForCurrentThread();
- gpu_.reset();
if (ViewsDelegate::GetInstance()) {
ViewsDelegate::GetInstance()->set_native_widget_factory(
« no previous file with comments | « ui/views/mus/mus_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698