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); |