OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/renderer_webkitplatformsupport_impl.h" | 5 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/platform_file.h" | 10 #include "base/platform_file.h" |
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
596 static_cast<uint32>(key_size_index), | 596 static_cast<uint32>(key_size_index), |
597 challenge.utf8(), | 597 challenge.utf8(), |
598 GURL(url), | 598 GURL(url), |
599 &signed_public_key)); | 599 &signed_public_key)); |
600 return WebString::fromUTF8(signed_public_key); | 600 return WebString::fromUTF8(signed_public_key); |
601 } | 601 } |
602 | 602 |
603 //------------------------------------------------------------------------------ | 603 //------------------------------------------------------------------------------ |
604 | 604 |
605 WebBlobRegistry* RendererWebKitPlatformSupportImpl::blobRegistry() { | 605 WebBlobRegistry* RendererWebKitPlatformSupportImpl::blobRegistry() { |
606 // RenderThreadImpl::current can be NULL when running some tests. | 606 // ChildThread::current can be NULL when running some tests. |
607 if (!blob_registry_.get() && RenderThreadImpl::current()) { | 607 if (!blob_registry_.get() && ChildThread::current()) { |
608 blob_registry_.reset(new WebBlobRegistryImpl(RenderThreadImpl::Get())); | 608 blob_registry_.reset(new WebBlobRegistryImpl(ChildThread::current())); |
michaeln
2011/10/12 01:52:55
i'll take this file out of this CL and move it to
| |
609 } | 609 } |
610 return blob_registry_.get(); | 610 return blob_registry_.get(); |
611 } | 611 } |
OLD | NEW |