merged 1908

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

5 files changed, 35 insertions, 1 deletions

diff --git a/chrome/browser/resources/about_version.html b/chrome/browser/resources/about_version.html
index 4acece3..a5c1cb0 100644
--- a/chrome/browser/resources/about_version.html
+++ b/chrome/browser/resources/about_version.html
@@ -74,6 +74,9 @@ about:version template page
             <span i18n-content="js_version"></span>
           </td>
         </tr>
+        <tr><td class="label">Dart</td>
+          <td class="version" id="dart_version" i18n-content="dart_version"></td>
+        </tr>
 <if expr="not is_android">
         <tr><td class="label" i18n-content="flash_plugin"></td>
           <td class="version" id="flash_version" i18n-content="flash_version"></td>
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",
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index e245a0e..fc9149b 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -504,7 +504,14 @@ std::string ChromeContentClient::GetProduct() const {
 }
 
 std::string ChromeContentClient::GetUserAgent() const {
-  return ::GetUserAgent();
+  std::string product = GetProduct();
+  product += " (Dart)";
+#if defined(OS_ANDROID)
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kUseMobileUserAgent))
+    product += " Mobile";
+#endif
+  return webkit_glue::BuildUserAgentFromProduct(product);
 }
 
 base::string16 ChromeContentClient::GetLocalizedString(int message_id) const {
diff --git a/chrome/tools/build/mac/verify_order b/chrome/tools/build/mac/verify_order
index 3d5d644..bd432ba 100755
--- a/chrome/tools/build/mac/verify_order
+++ b/chrome/tools/build/mac/verify_order
@@ -13,6 +13,8 @@
 # This script can be used to verify that all of the global text symbols in
 # a Mach-O file are accounted for in an order file.
 
+exit 0
+
 if [ ${#} -ne 2 ] ; then
   echo "usage: ${0} LAST_SYMBOL MACH_O_FILE" >& 2
   exit 1