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: content/renderer/mus/render_widget_window_tree_client_factory.cc

Issue 2136313002: Fix --use-mus-in-renderer for mus+ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build error. Created 4 years, 5 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 | « content/renderer/mus/render_widget_mus_connection.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/mus/render_widget_window_tree_client_factory.cc
diff --git a/content/renderer/mus/render_widget_window_tree_client_factory.cc b/content/renderer/mus/render_widget_window_tree_client_factory.cc
index ef56edd1be5ddd10bc8fa4a5665ac2064db50596..5abfc23f4c02e40bed6e8a29b965f1eb065e531b 100644
--- a/content/renderer/mus/render_widget_window_tree_client_factory.cc
+++ b/content/renderer/mus/render_widget_window_tree_client_factory.cc
@@ -10,6 +10,7 @@
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "content/common/render_widget_window_tree_client_factory.mojom.h"
+#include "content/public/child/child_thread.h"
#include "content/public/common/mojo_shell_connection.h"
#include "content/renderer/mus/render_widget_mus_connection.h"
#include "mojo/public/cpp/bindings/binding_set.h"
@@ -32,7 +33,7 @@ class RenderWidgetWindowTreeClientFactoryImpl
public mojom::RenderWidgetWindowTreeClientFactory {
public:
RenderWidgetWindowTreeClientFactoryImpl() {
- DCHECK(MojoShellConnection::GetForProcess());
+ DCHECK(ChildThread::Get()->GetMojoShellConnection());
}
~RenderWidgetWindowTreeClientFactoryImpl() override {}
@@ -68,7 +69,7 @@ class RenderWidgetWindowTreeClientFactoryImpl
} // namespace
void CreateRenderWidgetWindowTreeClientFactory() {
- MojoShellConnection::GetForProcess()->MergeService(
+ ChildThread::Get()->GetMojoShellConnection()->MergeService(
base::WrapUnique(new RenderWidgetWindowTreeClientFactoryImpl));
}
« no previous file with comments | « content/renderer/mus/render_widget_mus_connection.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698