summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-10 14:28:45 +0000
committerpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-10 14:28:45 +0000
commit3c8c8cb7e718a9289a85574b4b0453fd4a5f6bd7 (patch)
treebf021778e309c779ce44da107fe68301c252619c /webkit
parenta75ca09a0c41053cb3a8a76ad8ea63e137c74471 (diff)
downloadchromium_src-3c8c8cb7e718a9289a85574b4b0453fd4a5f6bd7.zip
chromium_src-3c8c8cb7e718a9289a85574b4b0453fd4a5f6bd7.tar.gz
chromium_src-3c8c8cb7e718a9289a85574b4b0453fd4a5f6bd7.tar.bz2
make more cross platform, use process_utils to get proc id. remove unused header.
Review URL: http://codereview.chromium.org/1857 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1985 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/resource_handle_win.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/glue/resource_handle_win.cc b/webkit/glue/resource_handle_win.cc
index 38af87c..2771b21 100644
--- a/webkit/glue/resource_handle_win.cc
+++ b/webkit/glue/resource_handle_win.cc
@@ -34,7 +34,6 @@
#include "ResourceError.h"
#include "ResourceHandle.h"
#include "ResourceHandleClient.h"
-#include "ResourceHandleWin.h" // for Platform{Response,Data}Struct
#include "ResourceRequest.h"
#include "ResourceResponse.h"
#pragma warning(pop)
@@ -42,6 +41,7 @@
#undef LOG
#include "base/logging.h"
#include "base/message_loop.h"
+#include "base/process_util.h"
#include "base/time.h"
#include "base/string_util.h"
#include "base/string_tokenizer.h"
@@ -296,7 +296,7 @@ bool ResourceHandleInternal::Start(
request_.frame() ? WebFrameImpl::FromFrame(request_.frame()) : NULL;
CString method = request_.httpMethod().latin1();
- GURL referrer(webkit_glue::StringToStdWString(request_.httpReferrer()));
+ GURL referrer(webkit_glue::StringToStdString(request_.httpReferrer()));
// Compute the URL of the load.
GURL url = webkit_glue::KURLToGURL(request_.url());
@@ -319,7 +319,7 @@ bool ResourceHandleInternal::Start(
GURL policy_url;
if (request_.resourceType() != ResourceType::MAIN_FRAME &&
request_.frame() && request_.frame()->document()) {
- policy_url = GURL(webkit_glue::StringToStdWString(
+ policy_url = GURL(webkit_glue::StringToStdString(
request_.frame()->document()->policyBaseURL()));
}
@@ -334,8 +334,8 @@ bool ResourceHandleInternal::Start(
if (!headerMap.contains("accept"))
request_.addHTTPHeaderField("Accept", "*/*");
- const String crlf(L"\r\n");
- const String sep(L": ");
+ const String crlf("\r\n");
+ const String sep(": ");
for (HTTPHeaderMap::const_iterator it = headerMap.begin();
it != headerMap.end(); ++it) {
// Skip over referrer headers found in the header map because we already
@@ -377,7 +377,7 @@ bool ResourceHandleInternal::Start(
// have a origin_pid. Find a better place to set this.
int origin_pid = request_.originPid();
if (origin_pid == 0)
- origin_pid = ::GetCurrentProcessId();
+ origin_pid = process_util::GetCurrentProcId();
bool mixed_content =
webkit_glue::KURLToGURL(request_.mainDocumentURL()).SchemeIsSecure() &&