summaryrefslogtreecommitdiffstats
path: root/chrome/common/common_param_traits.h
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-05-31 20:30:28 +0100
committerKristian Monsen <kristianm@google.com>2011-06-14 20:31:41 -0700
commit72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 (patch)
tree382278a54ce7a744d62fa510a9a80688cc12434b /chrome/common/common_param_traits.h
parentc4becdd46e31d261b930e4b5a539cbc1d45c23a6 (diff)
downloadexternal_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.zip
external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.gz
external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.bz2
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
Diffstat (limited to 'chrome/common/common_param_traits.h')
-rw-r--r--chrome/common/common_param_traits.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/common/common_param_traits.h b/chrome/common/common_param_traits.h
index ad9c05a..f1e8cb0 100644
--- a/chrome/common/common_param_traits.h
+++ b/chrome/common/common_param_traits.h
@@ -18,7 +18,6 @@
#include "base/ref_counted.h"
#include "chrome/common/content_settings.h"
#include "chrome/common/page_zoom.h"
-#include "gfx/native_widget_types.h"
#include "ipc/ipc_message_utils.h"
#include "net/url_request/url_request_status.h"
#include "printing/native_metafile.h"
@@ -30,6 +29,7 @@
//
// TODO(erg): The following two headers are historical and only work because
// their definitions are inlined, which also needs to be fixed.
+#include "ui/gfx/native_widget_types.h"
#include "webkit/glue/webcursor.h"
#include "webkit/glue/window_open_disposition.h"
@@ -265,8 +265,8 @@ struct ParamTraits<TransportDIB::Id> {
// Traits for URLRequestStatus
template <>
-struct ParamTraits<URLRequestStatus> {
- typedef URLRequestStatus param_type;
+struct ParamTraits<net::URLRequestStatus> {
+ typedef net::URLRequestStatus param_type;
static void Write(Message* m, const param_type& p);
static bool Read(const Message* m, void** iter, param_type* r);
static void Log(const param_type& p, std::string* l);