diff options
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 2 | ||||
| -rw-r--r-- | content/child/simple_webmimeregistry_impl.cc | 7 | ||||
| -rw-r--r-- | content/child/simple_webmimeregistry_impl.h | 2 | ||||
| -rw-r--r-- | content/shell/common/shell_content_client.cc | 1 | ||||
| -rw-r--r-- | content/worker/worker_webkitplatformsupport_impl.cc | 6 | ||||
| -rw-r--r-- | content/worker/worker_webkitplatformsupport_impl.h | 2 |
6 files changed, 19 insertions, 1 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 9659231..4357be0 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -133,7 +133,7 @@ void SetupSandbox(const CommandLine& parsed_command_line) { scoped_ptr<sandbox::SetuidSandboxClient> setuid_sandbox_client( sandbox::SetuidSandboxClient::Create()); - const bool want_setuid_sandbox = + const bool want_setuid_sandbox = false && !parsed_command_line.HasSwitch(switches::kNoSandbox) && !parsed_command_line.HasSwitch(switches::kDisableSetuidSandbox) && !setuid_sandbox_client->IsDisabledViaEnvironment(); diff --git a/content/child/simple_webmimeregistry_impl.cc b/content/child/simple_webmimeregistry_impl.cc index 3b3ebd6..205f08a 100644 --- a/content/child/simple_webmimeregistry_impl.cc +++ b/content/child/simple_webmimeregistry_impl.cc @@ -40,6 +40,13 @@ WebMimeRegistry::SupportsType WebMimeRegistry::IsSupported : WebMimeRegistry::IsNotSupported; } +WebMimeRegistry::SupportsType + SimpleWebMimeRegistryImpl::supportsDartMIMEType( + const WebString& mime_type) { + return net::IsSupportedDartMimeType(ToASCIIOrEmpty(mime_type)) ? + WebMimeRegistry::IsSupported : WebMimeRegistry::IsNotSupported; +} + // When debugging layout tests failures in the test shell, // see TestShellWebMimeRegistryImpl. WebMimeRegistry::SupportsType SimpleWebMimeRegistryImpl::supportsMediaMIMEType( diff --git a/content/child/simple_webmimeregistry_impl.h b/content/child/simple_webmimeregistry_impl.h index 4f88015..2474ea3 100644 --- a/content/child/simple_webmimeregistry_impl.h +++ b/content/child/simple_webmimeregistry_impl.h @@ -30,6 +30,8 @@ class CONTENT_EXPORT SimpleWebMimeRegistryImpl : const blink::WebString&); virtual blink::WebMimeRegistry::SupportsType supportsJavaScriptMIMEType( const blink::WebString&); + virtual blink::WebMimeRegistry::SupportsType supportsDartMIMEType( + const blink::WebString&); virtual blink::WebMimeRegistry::SupportsType supportsMediaMIMEType( const blink::WebString&, const blink::WebString&, diff --git a/content/shell/common/shell_content_client.cc b/content/shell/common/shell_content_client.cc index f3bfc52..a56bc53 100644 --- a/content/shell/common/shell_content_client.cc +++ b/content/shell/common/shell_content_client.cc @@ -23,6 +23,7 @@ ShellContentClient::~ShellContentClient() { std::string ShellContentClient::GetUserAgent() const { std::string product = "Chrome/" CONTENT_SHELL_VERSION; + product += " (Dart)"; CommandLine* command_line = CommandLine::ForCurrentProcess(); if (command_line->HasSwitch(switches::kUseMobileUserAgent)) product += " Mobile"; diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc index 3a57f94..e078b2a 100644 --- a/content/worker/worker_webkitplatformsupport_impl.cc +++ b/content/worker/worker_webkitplatformsupport_impl.cc @@ -242,6 +242,12 @@ WorkerWebKitPlatformSupportImpl::supportsJavaScriptMIMEType(const WebString&) { } WebMimeRegistry::SupportsType +WorkerWebKitPlatformSupportImpl::supportsDartMIMEType(const WebString&) { + NOTREACHED(); + return WebMimeRegistry::IsSupported; +} + +WebMimeRegistry::SupportsType WorkerWebKitPlatformSupportImpl::supportsMediaMIMEType( const WebString&, const WebString&, const WebString&) { NOTREACHED(); diff --git a/content/worker/worker_webkitplatformsupport_impl.h b/content/worker/worker_webkitplatformsupport_impl.h index 9fa56d4..f7a9cc5 100644 --- a/content/worker/worker_webkitplatformsupport_impl.h +++ b/content/worker/worker_webkitplatformsupport_impl.h @@ -83,6 +83,8 @@ class WorkerWebKitPlatformSupportImpl : public BlinkPlatformImpl, const blink::WebString&); virtual blink::WebMimeRegistry::SupportsType supportsJavaScriptMIMEType( const blink::WebString&); + virtual blink::WebMimeRegistry::SupportsType supportsDartMIMEType( + const WebKit::WebString&); virtual blink::WebMimeRegistry::SupportsType supportsMediaMIMEType( const blink::WebString&, const blink::WebString&, |