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

Unified Diff: content/browser/webui/web_ui_data_source_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/browser/renderer_host/render_view_host_impl.cc ('k') | content/common/content_message_generator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/webui/web_ui_data_source_impl.cc
diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc
index 990278e44342163b27777e73924c7499ffee2113..c2eb6ce800871f7044340b8c50693590015b4ca0 100644
--- a/content/browser/webui/web_ui_data_source_impl.cc
+++ b/content/browser/webui/web_ui_data_source_impl.cc
@@ -11,13 +11,10 @@
#include "base/strings/string_util.h"
#include "content/public/common/content_client.h"
#include "grit/content_resources.h"
+#include "mojo/public/js/bindings/constants.h"
#include "ui/base/webui/jstemplate_builder.h"
#include "ui/base/webui/web_ui_util.h"
-#if defined(USE_MOJO)
-#include "mojo/public/js/bindings/constants.h"
-#endif
-
namespace content {
// static
@@ -25,7 +22,6 @@ WebUIDataSource* WebUIDataSource::Create(const std::string& source_name) {
return new WebUIDataSourceImpl(source_name);
}
-#if defined(USE_MOJO)
// static
WebUIDataSource* WebUIDataSource::AddMojoDataSource(
BrowserContext* browser_context) {
@@ -46,7 +42,6 @@ WebUIDataSource* WebUIDataSource::AddMojoDataSource(
URLDataManager::AddWebUIDataSource(browser_context, mojo_source);
return mojo_source;
}
-#endif
// static
void WebUIDataSource::Add(BrowserContext* browser_context,
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.cc ('k') | content/common/content_message_generator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698