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

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

Issue 2194003002: services/ui: Have an explicit lifetime/ownership of ui::GpuService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot merge Created 4 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 | « ui/views/mus/window_manager_connection.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/window_manager_connection.cc
diff --git a/ui/views/mus/window_manager_connection.cc b/ui/views/mus/window_manager_connection.cc
index 2389915defdd9aae355fff84a285c6e9f20683d9..a16ed87092f9cffeb1c1324231104bd4901211ba 100644
--- a/ui/views/mus/window_manager_connection.cc
+++ b/ui/views/mus/window_manager_connection.cc
@@ -41,7 +41,7 @@ WindowManagerConnection::~WindowManagerConnection() {
// we are still valid.
client_.reset();
ui::Clipboard::DestroyClipboardForCurrentThread();
- ui::GpuService::Terminate();
+ gpu_service_.reset();
lazy_tls_ptr.Pointer()->Set(nullptr);
if (ViewsDelegate::GetInstance()) {
@@ -150,8 +150,7 @@ WindowManagerConnection::WindowManagerConnection(
: connector_(connector), identity_(identity) {
lazy_tls_ptr.Pointer()->Set(this);
- ui::GpuService::Initialize(connector);
-
+ gpu_service_ = ui::GpuService::Initialize(connector);
client_.reset(new ui::WindowTreeClient(this, nullptr, nullptr));
client_->ConnectViaWindowTreeFactory(connector_);
« no previous file with comments | « ui/views/mus/window_manager_connection.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698