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

Unified Diff: chrome/browser/ui/webui/devtools_ui.cc

Issue 239993009: Revert accidental dartium code push (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | « chrome/browser/resources/about_version.html ('k') | chrome/browser/ui/webui/version_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/devtools_ui.cc
diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc
index 5792f2e3f76e2ee8224e4c4aafc31a432dfd195c..d3cff300d8461bfb3f91eff0fb85d6ce33e76f8b 100644
--- a/chrome/browser/ui/webui/devtools_ui.cc
+++ b/chrome/browser/ui/webui/devtools_ui.cc
@@ -95,12 +95,6 @@ std::string GetMimeTypeForPath(const std::string& path) {
return "image/png";
} else if (EndsWith(filename, ".gif", false)) {
return "image/gif";
- } else if (EndsWith(filename, ".svg", false)) {
- return "image/svg+xml";
- } else if (EndsWith(filename, ".ttf", false)) {
- return "application/octet-stream";
- } else if (EndsWith(filename, ".woff", false)) {
- return "application/font-woff";
} else if (EndsWith(filename, ".manifest", false)) {
return "text/cache-manifest";
}
@@ -186,14 +180,6 @@ class DevToolsDataSource : public content::URLDataSource {
}
virtual bool ShouldAddContentSecurityPolicy() const OVERRIDE {
- // Required as the Dart Observatory is bundled as its own iframe hosted on
- // chrome-devtools.
- return true;
- }
-
- virtual bool ShouldDenyXFrameOptions() const OVERRIDE {
- // Required as the Dart Observatory is bundled as its own iframe hosted on
- // chrome-devtools.
return false;
}
@@ -201,11 +187,6 @@ class DevToolsDataSource : public content::URLDataSource {
return true;
}
- virtual std::string GetContentSecurityPolicyFrameSrc() const OVERRIDE {
- // The Dart Observatory is bundled as its own iframe.
- return "frame-src chrome-devtools://devtools/bundled/Observatory/index_devtools.html;";
- }
-
private:
virtual ~DevToolsDataSource() {}
scoped_refptr<net::URLRequestContextGetter> request_context_;
« no previous file with comments | « chrome/browser/resources/about_version.html ('k') | chrome/browser/ui/webui/version_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698