| 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 "webkit/blob/blob_data.h" | 5 #include "webkit/blob/blob_data.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/sys_string_conversions.h" | 8 #include "base/sys_string_conversions.h" |
| 9 #include "base/time.h" | 9 #include "base/time.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| 11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobData.h" | 11 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobData.
h" |
| 12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h" | 12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h
" |
| 13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebData.h" | 13 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h" |
| 14 | 14 |
| 15 using WebKit::WebBlobData; | 15 using WebKit::WebBlobData; |
| 16 using WebKit::WebData; | 16 using WebKit::WebData; |
| 17 using WebKit::WebString; | 17 using WebKit::WebString; |
| 18 | 18 |
| 19 namespace { | 19 namespace { |
| 20 | 20 |
| 21 // TODO(dpranke): These two functions are cloned from webkit_glue | 21 // TODO(dpranke): These two functions are cloned from webkit_glue |
| 22 // to avoid a dependency on that library. This should be fixed. | 22 // to avoid a dependency on that library. This should be fixed. |
| 23 FilePath::StringType WebStringToFilePathString(const WebString& str) { | 23 FilePath::StringType WebStringToFilePathString(const WebString& str) { |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 NOTREACHED(); | 78 NOTREACHED(); |
| 79 } | 79 } |
| 80 } | 80 } |
| 81 content_type_= data.contentType().utf8().data(); | 81 content_type_= data.contentType().utf8().data(); |
| 82 content_disposition_ = data.contentDisposition().utf8().data(); | 82 content_disposition_ = data.contentDisposition().utf8().data(); |
| 83 } | 83 } |
| 84 | 84 |
| 85 BlobData::~BlobData() {} | 85 BlobData::~BlobData() {} |
| 86 | 86 |
| 87 } // namespace webkit_blob | 87 } // namespace webkit_blob |
| OLD | NEW |