Index: content/common/appcache_messages.h |
diff --git a/content/common/appcache_messages.h b/content/common/appcache_messages.h |
index 8ad8fd5a5d7091190a7d29660e2b39f1d87b8027..15d37582d510cd9f63742441cffeef9d7d191e4b 100644 |
--- a/content/common/appcache_messages.h |
+++ b/content/common/appcache_messages.h |
@@ -5,18 +5,18 @@ |
// Multiply-included message file, hence no include guard. |
#include "ipc/ipc_message_macros.h" |
-#include "webkit/common/appcache/appcache_interfaces.h" |
+#include "content/common/appcache_interfaces.h" |
#define IPC_MESSAGE_START AppCacheMsgStart |
-IPC_ENUM_TRAITS_MAX_VALUE(appcache::AppCacheEventID, |
- appcache::APPCACHE_EVENT_ID_LAST) |
-IPC_ENUM_TRAITS_MAX_VALUE(appcache::AppCacheStatus, |
- appcache::APPCACHE_STATUS_LAST) |
-IPC_ENUM_TRAITS_MAX_VALUE(appcache::AppCacheErrorReason, |
- appcache::APPCACHE_ERROR_REASON_LAST) |
+IPC_ENUM_TRAITS_MAX_VALUE(content::AppCacheEventID, |
+ content::APPCACHE_EVENT_ID_LAST) |
+IPC_ENUM_TRAITS_MAX_VALUE(content::AppCacheStatus, |
+ content::APPCACHE_STATUS_LAST) |
+IPC_ENUM_TRAITS_MAX_VALUE(content::AppCacheErrorReason, |
+ content::APPCACHE_ERROR_REASON_LAST) |
-IPC_STRUCT_TRAITS_BEGIN(appcache::AppCacheInfo) |
+IPC_STRUCT_TRAITS_BEGIN(content::AppCacheInfo) |
IPC_STRUCT_TRAITS_MEMBER(manifest_url) |
IPC_STRUCT_TRAITS_MEMBER(creation_time) |
IPC_STRUCT_TRAITS_MEMBER(last_update_time) |
@@ -28,7 +28,7 @@ IPC_STRUCT_TRAITS_BEGIN(appcache::AppCacheInfo) |
IPC_STRUCT_TRAITS_MEMBER(is_complete) |
IPC_STRUCT_TRAITS_END() |
-IPC_STRUCT_TRAITS_BEGIN(appcache::AppCacheResourceInfo) |
+IPC_STRUCT_TRAITS_BEGIN(content::AppCacheResourceInfo) |
IPC_STRUCT_TRAITS_MEMBER(url) |
IPC_STRUCT_TRAITS_MEMBER(size) |
IPC_STRUCT_TRAITS_MEMBER(is_master) |
@@ -38,7 +38,7 @@ IPC_STRUCT_TRAITS_BEGIN(appcache::AppCacheResourceInfo) |
IPC_STRUCT_TRAITS_MEMBER(is_explicit) |
IPC_STRUCT_TRAITS_END() |
-IPC_STRUCT_TRAITS_BEGIN(appcache::AppCacheErrorDetails) |
+IPC_STRUCT_TRAITS_BEGIN(content::AppCacheErrorDetails) |
IPC_STRUCT_TRAITS_MEMBER(message) |
IPC_STRUCT_TRAITS_MEMBER(reason) |
IPC_STRUCT_TRAITS_MEMBER(url) |
@@ -96,7 +96,7 @@ IPC_MESSAGE_CONTROL3(AppCacheHostMsg_MarkAsForeignEntry, |
// Returns the status of the appcache associated with host_id. |
IPC_SYNC_MESSAGE_CONTROL1_1(AppCacheHostMsg_GetStatus, |
int /* host_id */, |
- appcache::AppCacheStatus) |
+ content::AppCacheStatus) |
// Initiates an update of the appcache associated with host_id. |
IPC_SYNC_MESSAGE_CONTROL1_1(AppCacheHostMsg_StartUpdate, |
@@ -111,7 +111,7 @@ IPC_SYNC_MESSAGE_CONTROL1_1(AppCacheHostMsg_SwapCache, |
// Gets resource list from appcache synchronously. |
IPC_SYNC_MESSAGE_CONTROL1_1(AppCacheHostMsg_GetResourceList, |
int /* host_id in*/, |
- std::vector<appcache::AppCacheResourceInfo> |
+ std::vector<content::AppCacheResourceInfo> |
/* resources out */) |
@@ -121,18 +121,18 @@ IPC_SYNC_MESSAGE_CONTROL1_1(AppCacheHostMsg_GetResourceList, |
// a particular host. This is sent in reply to AppCacheHostMsg_SelectCache. |
IPC_MESSAGE_CONTROL2(AppCacheMsg_CacheSelected, |
int /* host_id */, |
- appcache::AppCacheInfo) |
+ content::AppCacheInfo) |
// Notifies the renderer of an AppCache status change. |
IPC_MESSAGE_CONTROL2(AppCacheMsg_StatusChanged, |
std::vector<int> /* host_ids */, |
- appcache::AppCacheStatus) |
+ content::AppCacheStatus) |
// Notifies the renderer of an AppCache event other than the |
// progress event which has a seperate message. |
IPC_MESSAGE_CONTROL2(AppCacheMsg_EventRaised, |
std::vector<int> /* host_ids */, |
- appcache::AppCacheEventID) |
+ content::AppCacheEventID) |
// Notifies the renderer of an AppCache progress event. |
IPC_MESSAGE_CONTROL4(AppCacheMsg_ProgressEventRaised, |
@@ -144,7 +144,7 @@ IPC_MESSAGE_CONTROL4(AppCacheMsg_ProgressEventRaised, |
// Notifies the renderer of an AppCache error event. |
IPC_MESSAGE_CONTROL2(AppCacheMsg_ErrorEventRaised, |
std::vector<int> /* host_ids */, |
- appcache::AppCacheErrorDetails) |
+ content::AppCacheErrorDetails) |
// Notifies the renderer of an AppCache logging message. |
IPC_MESSAGE_CONTROL3(AppCacheMsg_LogMessage, |