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

Unified Diff: content/renderer/render_view_impl.cc

Issue 1484013003: mustash: Implement basic input event routing in renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: The right diff Created 5 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
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 765f8267aec496581abda938b90970bdefc8e120..8f1972272dfc428b953cb6a155b68f53e37db531 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -28,6 +28,7 @@
#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
+#include "base/synchronization/waitable_event.h"
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
#include "content/child/appcache/appcache_dispatcher.h"
@@ -213,6 +214,7 @@
#if defined(MOJO_SHELL_CLIENT)
#include "content/public/common/mojo_shell_connection.h"
#include "content/renderer/render_widget_mus_connection.h"
+#include "mojo/application/public/cpp/application_impl.h"
#endif
using blink::WebAXObject;
@@ -1720,7 +1722,7 @@ scoped_ptr<cc::OutputSurface> RenderViewImpl::CreateOutputSurface(
bool fallback) {
if (MojoShellConnection::Get()->GetApplication()) {
RenderWidgetMusConnection* connection =
- RenderWidgetMusConnection::Get(routing_id());
+ RenderWidgetMusConnection::GetOrCreate(routing_id());
return connection->CreateOutputSurface();
}
return RenderWidget::CreateOutputSurface(fallback);

Powered by Google App Engine
This is Rietveld 408576698