merged 1908

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264526 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 22 insertions, 0 deletions

diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc
index d3cff30..5792f2e 100644
--- a/chrome/browser/ui/webui/devtools_ui.cc
+++ b/chrome/browser/ui/webui/devtools_ui.cc
@@ -95,6 +95,12 @@ 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";
   }
@@ -180,6 +186,14 @@ 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;
   }
 
@@ -187,6 +201,11 @@ 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_;
diff --git a/chrome/browser/ui/webui/version_ui.cc b/chrome/browser/ui/webui/version_ui.cc
index e07eb52..a5b790f 100644
--- a/chrome/browser/ui/webui/version_ui.cc
+++ b/chrome/browser/ui/webui/version_ui.cc
@@ -36,6 +36,8 @@
 #include "chrome/browser/ui/webui/version_handler_chromeos.h"
 #endif
 
+#include "dartvm_revision.h"  // NOLINT
+
 namespace {
 
 content::WebUIDataSource* CreateVersionUIDataSource(Profile* profile) {
@@ -54,6 +56,7 @@ content::WebUIDataSource* CreateVersionUIDataSource(Profile* profile) {
   html_source->AddString("blink_version", content::GetWebKitVersion());
   html_source->AddString("js_engine", "V8");
   html_source->AddString("js_version", v8::V8::GetVersion());
+  html_source->AddString("dart_version", DART_VM_REVISION);
 
 #if defined(OS_ANDROID)
   html_source->AddLocalizedString("application_label",