| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/glue/glue_serialize.h" | 5 #include "webkit/glue/glue_serialize.h" | 
| 6 | 6 | 
| 7 #include <string> | 7 #include <string> | 
| 8 | 8 | 
| 9 #include "base/pickle.h" | 9 #include "base/pickle.h" | 
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" | 
| 11 #include "googleurl/src/gurl.h" | 11 #include "googleurl/src/gurl.h" | 
| 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" | 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" | 
| 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPBody.h" | 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPBody.h" | 
| 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" | 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" | 
| 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" | 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" | 
| 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" | 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" | 
| 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" | 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" | 
| 18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" | 18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" | 
| 19 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerialize
     dScriptValue.h" | 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptVa
     lue.h" | 
| 20 #include "webkit/base/file_path_string_conversions.h" | 20 #include "webkit/base/file_path_string_conversions.h" | 
| 21 | 21 | 
| 22 using WebKit::WebData; | 22 using WebKit::WebData; | 
| 23 using WebKit::WebHistoryItem; | 23 using WebKit::WebHistoryItem; | 
| 24 using WebKit::WebHTTPBody; | 24 using WebKit::WebHTTPBody; | 
| 25 using WebKit::WebPoint; | 25 using WebKit::WebPoint; | 
| 26 using WebKit::WebSerializedScriptValue; | 26 using WebKit::WebSerializedScriptValue; | 
| 27 using WebKit::WebString; | 27 using WebKit::WebString; | 
| 28 using WebKit::WebUChar; | 28 using WebKit::WebUChar; | 
| 29 using WebKit::WebVector; | 29 using WebKit::WebVector; | 
| (...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 597   // serialization of the given URL with a dummy version number of -1.  This | 597   // serialization of the given URL with a dummy version number of -1.  This | 
| 598   // will be interpreted by ReadHistoryItem as a request to create a default | 598   // will be interpreted by ReadHistoryItem as a request to create a default | 
| 599   // WebHistoryItem. | 599   // WebHistoryItem. | 
| 600   SerializeObject obj; | 600   SerializeObject obj; | 
| 601   WriteInteger(-1, &obj); | 601   WriteInteger(-1, &obj); | 
| 602   WriteGURL(url, &obj); | 602   WriteGURL(url, &obj); | 
| 603   return obj.GetAsString(); | 603   return obj.GetAsString(); | 
| 604 } | 604 } | 
| 605 | 605 | 
| 606 }  // namespace webkit_glue | 606 }  // namespace webkit_glue | 
| OLD | NEW | 
|---|