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

Unified Diff: content/browser/webui/web_ui_data_source_impl.cc

Issue 1470823002: Enable builtin Mojo JS modules in layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@usb-testing
Patch Set: oops, clumsy Created 4 years, 11 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/webui/web_ui_data_source_impl.h ('k') | content/browser/webui/web_ui_mojo_browsertest.cc » ('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 9a026008daf93533a3cbcbeef20e90e75ae1b5fa..e8b5b9fdedbcfdf964678964695c33e40f04fea3 100644
--- a/content/browser/webui/web_ui_data_source_impl.cc
+++ b/content/browser/webui/web_ui_data_source_impl.cc
@@ -15,7 +15,6 @@
#include "content/grit/content_resources.h"
#include "content/public/browser/content_browser_client.h"
#include "content/public/common/content_client.h"
-#include "mojo/public/js/constants.h"
#include "ui/base/webui/jstemplate_builder.h"
#include "ui/base/webui/web_ui_util.h"
@@ -139,24 +138,6 @@ void WebUIDataSourceImpl::SetRequestFilter(
filter_callback_ = callback;
}
-void WebUIDataSourceImpl::AddMojoResources() {
- static const struct {
- const char* path;
- int id;
- } resources[] = {
- {mojo::kBindingsModuleName, IDR_MOJO_BINDINGS_JS},
- {mojo::kBufferModuleName, IDR_MOJO_BUFFER_JS},
- {mojo::kCodecModuleName, IDR_MOJO_CODEC_JS},
- {mojo::kConnectionModuleName, IDR_MOJO_CONNECTION_JS},
- {mojo::kConnectorModuleName, IDR_MOJO_CONNECTOR_JS},
- {mojo::kRouterModuleName, IDR_MOJO_ROUTER_JS},
- {mojo::kUnicodeModuleName, IDR_MOJO_UNICODE_JS},
- {mojo::kValidatorModuleName, IDR_MOJO_VALIDATOR_JS},
- };
- for (size_t i = 0; i < arraysize(resources); ++i)
- AddResourcePath(resources[i].path, resources[i].id);
-}
-
void WebUIDataSourceImpl::DisableReplaceExistingSource() {
replace_existing_source_ = false;
}
« no previous file with comments | « content/browser/webui/web_ui_data_source_impl.h ('k') | content/browser/webui/web_ui_mojo_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698