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

Unified Diff: content/renderer/render_view_impl.cc

Issue 226213002: Removes use_mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 2 trunk Created 6 years, 9 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/render_thread_impl.cc ('k') | content/test/content_test_launcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 666772ce409c3eaab9737b330165122bc737e074..f99c6ff3c26fd74261c3fc753d61741b043061b1 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -118,6 +118,7 @@
#include "content/renderer/v8_value_converter_impl.h"
#include "content/renderer/web_ui_extension.h"
#include "content/renderer/web_ui_extension_data.h"
+#include "content/renderer/web_ui_mojo.h"
#include "content/renderer/websharedworker_proxy.h"
#include "media/audio/audio_output_device.h"
#include "media/base/audio_renderer_mixer_input.h"
@@ -238,10 +239,6 @@
#include "content/renderer/media/rtc_peer_connection_handler.h"
#endif
-#if defined(USE_MOJO)
-#include "content/renderer/web_ui_mojo.h"
-#endif
-
using blink::WebAXObject;
using blink::WebApplicationCacheHost;
using blink::WebApplicationCacheHostClient;
@@ -3354,10 +3351,8 @@ void RenderViewImpl::OnAllowBindings(int enabled_bindings_flags) {
!(enabled_bindings_ & BINDINGS_POLICY_WEB_UI)) {
// WebUIExtensionData deletes itself when we're destroyed.
new WebUIExtensionData(this);
-#if defined(USE_MOJO)
// WebUIMojo deletes itself when we're destroyed.
new WebUIMojo(this);
-#endif
}
enabled_bindings_ |= enabled_bindings_flags;
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/test/content_test_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698