summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/accessibility/browser_accessibility_manager_mac.mm1
-rw-r--r--chrome/common/common_param_traits.cc43
-rw-r--r--chrome/common/common_param_traits.h15
-rw-r--r--chrome/common/file_system/file_system_dispatcher.cc53
-rw-r--r--chrome/common/file_system/file_system_dispatcher.h18
-rw-r--r--chrome/common/pepper_file_messages.h2
-rw-r--r--chrome/common/render_messages.h6
-rw-r--r--chrome/common/render_messages_internal.h106
-rw-r--r--chrome/common/render_messages_params.cc26
-rw-r--r--chrome/common/render_messages_params.h9
10 files changed, 35 insertions, 244 deletions
diff --git a/chrome/browser/accessibility/browser_accessibility_manager_mac.mm b/chrome/browser/accessibility/browser_accessibility_manager_mac.mm
index 47230aa..03a08dd 100644
--- a/chrome/browser/accessibility/browser_accessibility_manager_mac.mm
+++ b/chrome/browser/accessibility/browser_accessibility_manager_mac.mm
@@ -4,6 +4,7 @@
#include "chrome/browser/accessibility/browser_accessibility_manager_mac.h"
+#import "base/logging.h"
#import "chrome/browser/accessibility/browser_accessibility_cocoa.h"
#include "chrome/common/render_messages_params.h"
diff --git a/chrome/common/common_param_traits.cc b/chrome/common/common_param_traits.cc
index 5eefb26..38792bb 100644
--- a/chrome/common/common_param_traits.cc
+++ b/chrome/common/common_param_traits.cc
@@ -444,49 +444,6 @@ void ParamTraits<printing::NativeMetafile>::Log(
l->append("<printing::NativeMetafile>");
}
-void ParamTraits<base::PlatformFileInfo>::Write(
- Message* m, const param_type& p) {
- WriteParam(m, p.size);
- WriteParam(m, p.is_directory);
- WriteParam(m, p.last_modified.ToDoubleT());
- WriteParam(m, p.last_accessed.ToDoubleT());
- WriteParam(m, p.creation_time.ToDoubleT());
-}
-
-bool ParamTraits<base::PlatformFileInfo>::Read(
- const Message* m, void** iter, param_type* p) {
- double last_modified;
- double last_accessed;
- double creation_time;
- bool result =
- ReadParam(m, iter, &p->size) &&
- ReadParam(m, iter, &p->is_directory) &&
- ReadParam(m, iter, &last_modified) &&
- ReadParam(m, iter, &last_accessed) &&
- ReadParam(m, iter, &creation_time);
- if (result) {
- p->last_modified = base::Time::FromDoubleT(last_modified);
- p->last_accessed = base::Time::FromDoubleT(last_accessed);
- p->creation_time = base::Time::FromDoubleT(creation_time);
- }
- return result;
-}
-
-void ParamTraits<base::PlatformFileInfo>::Log(
- const param_type& p, std::string* l) {
- l->append("(");
- LogParam(p.size, l);
- l->append(",");
- LogParam(p.is_directory, l);
- l->append(",");
- LogParam(p.last_modified.ToDoubleT(), l);
- l->append(",");
- LogParam(p.last_accessed.ToDoubleT(), l);
- l->append(",");
- LogParam(p.creation_time.ToDoubleT(), l);
- l->append(")");
-}
-
void ParamTraits<printing::PrinterCapsAndDefaults>::Write(
Message* m, const param_type& p) {
WriteParam(m, p.printer_capabilities);
diff --git a/chrome/common/common_param_traits.h b/chrome/common/common_param_traits.h
index 1a2e4e6..28b48bc 100644
--- a/chrome/common/common_param_traits.h
+++ b/chrome/common/common_param_traits.h
@@ -14,7 +14,6 @@
#include "app/surface/transport_dib.h"
#include "base/file_util.h"
-#include "base/platform_file.h"
#include "base/ref_counted.h"
#include "chrome/common/content_settings.h"
#include "chrome/common/page_zoom.h"
@@ -287,20 +286,6 @@ struct ParamTraits<printing::NativeMetafile> {
};
template <>
-struct ParamTraits<base::PlatformFileInfo> {
- typedef base::PlatformFileInfo 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);
-};
-
-// Traits for base::PlatformFileError
-template <>
-struct SimilarTypeTraits<base::PlatformFileError> {
- typedef int Type;
-};
-
-template <>
struct ParamTraits<printing::PrinterCapsAndDefaults> {
typedef printing::PrinterCapsAndDefaults param_type;
static void Write(Message* m, const param_type& p);
diff --git a/chrome/common/file_system/file_system_dispatcher.cc b/chrome/common/file_system/file_system_dispatcher.cc
index 352deb3..de8814b 100644
--- a/chrome/common/file_system/file_system_dispatcher.cc
+++ b/chrome/common/file_system/file_system_dispatcher.cc
@@ -6,8 +6,7 @@
#include "base/file_util.h"
#include "chrome/common/child_thread.h"
-#include "chrome/common/render_messages.h"
-#include "chrome/common/render_messages_params.h"
+#include "content/common/file_system_messages.h"
FileSystemDispatcher::FileSystemDispatcher() {
}
@@ -27,13 +26,12 @@ FileSystemDispatcher::~FileSystemDispatcher() {
bool FileSystemDispatcher::OnMessageReceived(const IPC::Message& msg) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(FileSystemDispatcher, msg)
- IPC_MESSAGE_HANDLER(ViewMsg_OpenFileSystemRequest_Complete,
- OnOpenFileSystemRequestComplete)
- IPC_MESSAGE_HANDLER(ViewMsg_FileSystem_DidSucceed, DidSucceed)
- IPC_MESSAGE_HANDLER(ViewMsg_FileSystem_DidReadDirectory, DidReadDirectory)
- IPC_MESSAGE_HANDLER(ViewMsg_FileSystem_DidReadMetadata, DidReadMetadata)
- IPC_MESSAGE_HANDLER(ViewMsg_FileSystem_DidFail, DidFail)
- IPC_MESSAGE_HANDLER(ViewMsg_FileSystem_DidWrite, DidWrite)
+ IPC_MESSAGE_HANDLER(FileSystemMsg_OpenComplete, OnOpenComplete)
+ IPC_MESSAGE_HANDLER(FileSystemMsg_DidSucceed, OnDidSucceed)
+ IPC_MESSAGE_HANDLER(FileSystemMsg_DidReadDirectory, OnDidReadDirectory)
+ IPC_MESSAGE_HANDLER(FileSystemMsg_DidReadMetadata, OnDidReadMetadata)
+ IPC_MESSAGE_HANDLER(FileSystemMsg_DidFail, OnDidFail)
+ IPC_MESSAGE_HANDLER(FileSystemMsg_DidWrite, OnDidWrite)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
@@ -44,7 +42,7 @@ bool FileSystemDispatcher::OpenFileSystem(
long long size, bool create,
fileapi::FileSystemCallbackDispatcher* dispatcher) {
int request_id = dispatchers_.Add(dispatcher);
- if (!ChildThread::current()->Send(new ViewHostMsg_OpenFileSystemRequest(
+ if (!ChildThread::current()->Send(new FileSystemHostMsg_Open(
request_id, origin_url, type, size, create))) {
dispatchers_.Remove(request_id); // destroys |dispatcher|
return false;
@@ -58,7 +56,7 @@ bool FileSystemDispatcher::Move(
const FilePath& dest_path,
fileapi::FileSystemCallbackDispatcher* dispatcher) {
int request_id = dispatchers_.Add(dispatcher);
- if (!ChildThread::current()->Send(new ViewHostMsg_FileSystem_Move(
+ if (!ChildThread::current()->Send(new FileSystemHostMsg_Move(
request_id, src_path, dest_path))) {
dispatchers_.Remove(request_id); // destroys |dispatcher|
return false;
@@ -72,7 +70,7 @@ bool FileSystemDispatcher::Copy(
const FilePath& dest_path,
fileapi::FileSystemCallbackDispatcher* dispatcher) {
int request_id = dispatchers_.Add(dispatcher);
- if (!ChildThread::current()->Send(new ViewHostMsg_FileSystem_Copy(
+ if (!ChildThread::current()->Send(new FileSystemHostMsg_Copy(
request_id, src_path, dest_path))) {
dispatchers_.Remove(request_id); // destroys |dispatcher|
return false;
@@ -87,7 +85,7 @@ bool FileSystemDispatcher::Remove(
fileapi::FileSystemCallbackDispatcher* dispatcher) {
int request_id = dispatchers_.Add(dispatcher);
if (!ChildThread::current()->Send(
- new ViewHostMsg_FileSystem_Remove(request_id, path, recursive))) {
+ new FileSystemMsg_Remove(request_id, path, recursive))) {
dispatchers_.Remove(request_id); // destroys |dispatcher|
return false;
}
@@ -100,7 +98,7 @@ bool FileSystemDispatcher::ReadMetadata(
fileapi::FileSystemCallbackDispatcher* dispatcher) {
int request_id = dispatchers_.Add(dispatcher);
if (!ChildThread::current()->Send(
- new ViewHostMsg_FileSystem_ReadMetadata(request_id, path))) {
+ new FileSystemHostMsg_ReadMetadata(request_id, path))) {
dispatchers_.Remove(request_id); // destroys |dispatcher|
return false;
}
@@ -115,7 +113,7 @@ bool FileSystemDispatcher::Create(
bool recursive,
fileapi::FileSystemCallbackDispatcher* dispatcher) {
int request_id = dispatchers_.Add(dispatcher);
- if (!ChildThread::current()->Send(new ViewHostMsg_FileSystem_Create(
+ if (!ChildThread::current()->Send(new FileSystemHostMsg_Create(
request_id, path, exclusive, is_directory, recursive))) {
dispatchers_.Remove(request_id); // destroys |dispatcher|
return false;
@@ -130,7 +128,7 @@ bool FileSystemDispatcher::Exists(
fileapi::FileSystemCallbackDispatcher* dispatcher) {
int request_id = dispatchers_.Add(dispatcher);
if (!ChildThread::current()->Send(
- new ViewHostMsg_FileSystem_Exists(request_id, path, is_directory))) {
+ new FileSystemHostMsg_Exists(request_id, path, is_directory))) {
dispatchers_.Remove(request_id); // destroys |dispatcher|
return false;
}
@@ -143,7 +141,7 @@ bool FileSystemDispatcher::ReadDirectory(
fileapi::FileSystemCallbackDispatcher* dispatcher) {
int request_id = dispatchers_.Add(dispatcher);
if (!ChildThread::current()->Send(
- new ViewHostMsg_FileSystem_ReadDirectory(request_id, path))) {
+ new FileSystemHostMsg_ReadDirectory(request_id, path))) {
dispatchers_.Remove(request_id); // destroys |dispatcher|
return false;
}
@@ -158,7 +156,7 @@ bool FileSystemDispatcher::Truncate(
fileapi::FileSystemCallbackDispatcher* dispatcher) {
int request_id = dispatchers_.Add(dispatcher);
if (!ChildThread::current()->Send(
- new ViewHostMsg_FileSystem_Truncate(request_id, path, offset))) {
+ new FileSystemHostMsg_Truncate(request_id, path, offset))) {
dispatchers_.Remove(request_id); // destroys |dispatcher|
return false;
}
@@ -176,8 +174,7 @@ bool FileSystemDispatcher::Write(
fileapi::FileSystemCallbackDispatcher* dispatcher) {
int request_id = dispatchers_.Add(dispatcher);
if (!ChildThread::current()->Send(
- new ViewHostMsg_FileSystem_Write(
- request_id, path, blob_url, offset))) {
+ new FileSystemHostMsg_Write(request_id, path, blob_url, offset))) {
dispatchers_.Remove(request_id); // destroys |dispatcher|
return false;
}
@@ -191,7 +188,7 @@ bool FileSystemDispatcher::Cancel(
int request_id_to_cancel,
fileapi::FileSystemCallbackDispatcher* dispatcher) {
int request_id = dispatchers_.Add(dispatcher);
- if (!ChildThread::current()->Send(new ViewHostMsg_FileSystem_CancelWrite(
+ if (!ChildThread::current()->Send(new FileSystemHostMsg_CancelWrite(
request_id, request_id_to_cancel))) {
dispatchers_.Remove(request_id); // destroys |dispatcher|
return false;
@@ -207,7 +204,7 @@ bool FileSystemDispatcher::TouchFile(
fileapi::FileSystemCallbackDispatcher* dispatcher) {
int request_id = dispatchers_.Add(dispatcher);
if (!ChildThread::current()->Send(
- new ViewHostMsg_FileSystem_TouchFile(
+ new FileSystemHostMsg_TouchFile(
request_id, path, last_access_time, last_modified_time))) {
dispatchers_.Remove(request_id); // destroys |dispatcher|
return false;
@@ -216,7 +213,7 @@ bool FileSystemDispatcher::TouchFile(
return true;
}
-void FileSystemDispatcher::OnOpenFileSystemRequestComplete(
+void FileSystemDispatcher::OnOpenComplete(
int request_id, bool accepted, const std::string& name,
const FilePath& root_path) {
fileapi::FileSystemCallbackDispatcher* dispatcher =
@@ -229,7 +226,7 @@ void FileSystemDispatcher::OnOpenFileSystemRequestComplete(
dispatchers_.Remove(request_id);
}
-void FileSystemDispatcher::DidSucceed(int request_id) {
+void FileSystemDispatcher::OnDidSucceed(int request_id) {
fileapi::FileSystemCallbackDispatcher* dispatcher =
dispatchers_.Lookup(request_id);
DCHECK(dispatcher);
@@ -237,7 +234,7 @@ void FileSystemDispatcher::DidSucceed(int request_id) {
dispatchers_.Remove(request_id);
}
-void FileSystemDispatcher::DidReadMetadata(
+void FileSystemDispatcher::OnDidReadMetadata(
int request_id, const base::PlatformFileInfo& file_info) {
fileapi::FileSystemCallbackDispatcher* dispatcher =
dispatchers_.Lookup(request_id);
@@ -246,7 +243,7 @@ void FileSystemDispatcher::DidReadMetadata(
dispatchers_.Remove(request_id);
}
-void FileSystemDispatcher::DidReadDirectory(
+void FileSystemDispatcher::OnDidReadDirectory(
int request_id,
const std::vector<base::FileUtilProxy::Entry>& entries,
bool has_more) {
@@ -257,7 +254,7 @@ void FileSystemDispatcher::DidReadDirectory(
dispatchers_.Remove(request_id);
}
-void FileSystemDispatcher::DidFail(
+void FileSystemDispatcher::OnDidFail(
int request_id, base::PlatformFileError error_code) {
fileapi::FileSystemCallbackDispatcher* dispatcher =
dispatchers_.Lookup(request_id);
@@ -266,7 +263,7 @@ void FileSystemDispatcher::DidFail(
dispatchers_.Remove(request_id);
}
-void FileSystemDispatcher::DidWrite(
+void FileSystemDispatcher::OnDidWrite(
int request_id, int64 bytes, bool complete) {
fileapi::FileSystemCallbackDispatcher* dispatcher =
dispatchers_.Lookup(request_id);
diff --git a/chrome/common/file_system/file_system_dispatcher.h b/chrome/common/file_system/file_system_dispatcher.h
index bc84d2a..65e1a6d 100644
--- a/chrome/common/file_system/file_system_dispatcher.h
+++ b/chrome/common/file_system/file_system_dispatcher.h
@@ -76,23 +76,21 @@ class FileSystemDispatcher : public IPC::Channel::Listener {
fileapi::FileSystemCallbackDispatcher* dispatcher);
private:
- // Message handler for OpenFileSystem.
- void OnOpenFileSystemRequestComplete(
+ // Message handlers.
+ void OnOpenComplete(
int request_id,
bool accepted,
const std::string& name,
const FilePath& root_path);
-
- // Message handlers for regular file system operations.
- void DidSucceed(int request_id);
- void DidReadMetadata(int request_id,
- const base::PlatformFileInfo& file_info);
- void DidReadDirectory(
+ void OnDidSucceed(int request_id);
+ void OnDidReadMetadata(int request_id,
+ const base::PlatformFileInfo& file_info);
+ void OnDidReadDirectory(
int request_id,
const std::vector<base::FileUtilProxy::Entry>& entries,
bool has_more);
- void DidFail(int request_id, base::PlatformFileError error_code);
- void DidWrite(int request_id, int64 bytes, bool complete);
+ void OnDidFail(int request_id, base::PlatformFileError error_code);
+ void OnDidWrite(int request_id, int64 bytes, bool complete);
IDMap<fileapi::FileSystemCallbackDispatcher, IDMapOwnPointer> dispatchers_;
diff --git a/chrome/common/pepper_file_messages.h b/chrome/common/pepper_file_messages.h
index eff4d153..1298414 100644
--- a/chrome/common/pepper_file_messages.h
+++ b/chrome/common/pepper_file_messages.h
@@ -6,7 +6,7 @@
#define CHROME_COMMON_PEPPER_FILE_MESSAGES_H_
#pragma once
-#include "chrome/common/common_param_traits.h"
+#include "content/common/common_param_traits.h"
#include "ipc/ipc_message_macros.h"
#include "ipc/ipc_param_traits.h"
#include "ipc/ipc_platform_file.h"
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 777abe5..5a257f2 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -25,7 +25,6 @@
#include "ipc/ipc_platform_file.h" // ifdefed typedef.
#include "ui/base/clipboard/clipboard.h" // enum
#include "webkit/appcache/appcache_interfaces.h" // enum appcache::Status
-#include "webkit/fileapi/file_system_types.h" // enum fileapi::FileSystemType
#if defined(OS_MACOSX)
struct FontDescriptor;
@@ -456,11 +455,6 @@ struct ParamTraits<scoped_refptr<webkit_blob::BlobData> > {
static void Log(const param_type& p, std::string* l);
};
-template <>
-struct SimilarTypeTraits<fileapi::FileSystemType> {
- typedef int Type;
-};
-
// Traits for AudioBuffersState structure.
template <>
struct ParamTraits<AudioBuffersState> {
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 90d8717..23b997d 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -10,7 +10,6 @@
#include "build/build_config.h"
#include "base/file_path.h"
-#include "base/file_util_proxy.h"
#include "base/nullable_string16.h"
#include "base/platform_file.h"
#include "base/sync_socket.h"
@@ -948,32 +947,6 @@ IPC_MESSAGE_ROUTED0(ViewMsg_AccessibilityNotifications_ACK)
IPC_MESSAGE_ROUTED1(ViewMsg_DeviceOrientationUpdated,
ViewMsg_DeviceOrientationUpdated_Params)
-// WebFrameClient::openFileSystem response messages.
-IPC_MESSAGE_CONTROL4(ViewMsg_OpenFileSystemRequest_Complete,
- int /* request_id */,
- bool /* accepted */,
- std::string /* name */,
- FilePath /* root_path */)
-
-// WebFileSystem response messages.
-IPC_MESSAGE_CONTROL1(ViewMsg_FileSystem_DidSucceed,
- int /* request_id */)
-IPC_MESSAGE_CONTROL2(ViewMsg_FileSystem_DidReadMetadata,
- int /* request_id */,
- base::PlatformFileInfo)
-IPC_MESSAGE_CONTROL3(ViewMsg_FileSystem_DidReadDirectory,
- int /* request_id */,
- std::vector<base::FileUtilProxy::Entry> /* entries */,
- bool /* has_more */)
-
-IPC_MESSAGE_CONTROL3(ViewMsg_FileSystem_DidWrite,
- int /* request_id */,
- int64 /* byte count */,
- bool /* complete */)
-IPC_MESSAGE_CONTROL2(ViewMsg_FileSystem_DidFail,
- int /* request_id */,
- base::PlatformFileError /* error_code */)
-
// The response to ViewHostMsg_AsyncOpenFile.
IPC_MESSAGE_ROUTED3(ViewMsg_AsyncOpenFile_ACK,
base::PlatformFileError /* error_code */,
@@ -2283,85 +2256,6 @@ IPC_MESSAGE_CONTROL1(ViewHostMsg_DeviceOrientation_StopUpdating,
int /* render_view_id */)
//---------------------------------------------------------------------------
-// FileSystem API messages
-// These are messages sent from the renderer to the browser process.
-
-// WebFrameClient::openFileSystem() message.
-IPC_MESSAGE_CONTROL5(ViewHostMsg_OpenFileSystemRequest,
- int /* request_id */,
- GURL /* origin_url */,
- fileapi::FileSystemType /* type */,
- int64 /* requested_size */,
- bool /* create */)
-
-// WebFileSystem::move() message.
-IPC_MESSAGE_CONTROL3(ViewHostMsg_FileSystem_Move,
- int /* request_id */,
- FilePath /* src path */,
- FilePath /* dest path */)
-
-// WebFileSystem::copy() message.
-IPC_MESSAGE_CONTROL3(ViewHostMsg_FileSystem_Copy,
- int /* request_id */,
- FilePath /* src path */,
- FilePath /* dest path */)
-
-// WebFileSystem::remove() message.
-IPC_MESSAGE_CONTROL3(ViewHostMsg_FileSystem_Remove,
- int /* request_id */,
- FilePath /* path */,
- bool /* recursive */)
-
-// WebFileSystem::readMetadata() message.
-IPC_MESSAGE_CONTROL2(ViewHostMsg_FileSystem_ReadMetadata,
- int /* request_id */,
- FilePath /* path */)
-
-// WebFileSystem::create() message.
-IPC_MESSAGE_CONTROL5(ViewHostMsg_FileSystem_Create,
- int /* request_id */,
- FilePath /* path */,
- bool /* exclusive */,
- bool /* is_directory */,
- bool /* recursive */)
-
-// WebFileSystem::exists() messages.
-IPC_MESSAGE_CONTROL3(ViewHostMsg_FileSystem_Exists,
- int /* request_id */,
- FilePath /* path */,
- bool /* is_directory */)
-
-// WebFileSystem::readDirectory() message.
-IPC_MESSAGE_CONTROL2(ViewHostMsg_FileSystem_ReadDirectory,
- int /* request_id */,
- FilePath /* path */)
-
-// WebFileWriter::write() message.
-IPC_MESSAGE_CONTROL4(ViewHostMsg_FileSystem_Write,
- int /* request id */,
- FilePath /* file path */,
- GURL /* blob URL */,
- int64 /* position */)
-
-// WebFileWriter::truncate() message.
-IPC_MESSAGE_CONTROL3(ViewHostMsg_FileSystem_Truncate,
- int /* request id */,
- FilePath /* file path */,
- int64 /* length */)
-
-// Pepper's Touch() message.
-IPC_MESSAGE_CONTROL4(ViewHostMsg_FileSystem_TouchFile,
- int /* request_id */,
- FilePath /* path */,
- base::Time /* last_access_time */,
- base::Time /* last_modified_time */)
-
-// WebFileWriter::cancel() message.
-IPC_MESSAGE_CONTROL2(ViewHostMsg_FileSystem_CancelWrite,
- int /* request id */,
- int /* id of request to cancel */)
-
-//---------------------------------------------------------------------------
// Blob messages:
// Registers a blob URL referring to the specified blob data.
diff --git a/chrome/common/render_messages_params.cc b/chrome/common/render_messages_params.cc
index 336d67b..02ac083 100644
--- a/chrome/common/render_messages_params.cc
+++ b/chrome/common/render_messages_params.cc
@@ -1490,32 +1490,6 @@ void ParamTraits<ViewHostMsg_DomMessage_Params>::Log(const param_type& p,
l->append(")");
}
-void ParamTraits<base::FileUtilProxy::Entry>::Write(
- Message* m,
- const param_type& p) {
- WriteParam(m, p.name);
- WriteParam(m, p.is_directory);
-}
-
-bool ParamTraits<base::FileUtilProxy::Entry>::Read(
- const Message* m,
- void** iter,
- param_type* p) {
- return
- ReadParam(m, iter, &p->name) &&
- ReadParam(m, iter, &p->is_directory);
-}
-
-void ParamTraits<base::FileUtilProxy::Entry>::Log(
- const param_type& p,
- std::string* l) {
- l->append("(");
- LogParam(p.name, l);
- l->append(", ");
- LogParam(p.is_directory, l);
- l->append(")");
-}
-
void ParamTraits<ViewHostMsg_AccessibilityNotification_Params>::Write(
Message* m,
const param_type& p) {
diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h
index d698ca5..fb4b432 100644
--- a/chrome/common/render_messages_params.h
+++ b/chrome/common/render_messages_params.h
@@ -11,7 +11,6 @@
#include "app/surface/transport_dib.h"
#include "base/file_path.h"
-#include "base/file_util_proxy.h"
#include "base/ref_counted.h"
#include "base/shared_memory.h"
#include "base/time.h"
@@ -1103,14 +1102,6 @@ struct ParamTraits<ViewHostMsg_DomMessage_Params> {
};
template <>
-struct ParamTraits<base::FileUtilProxy::Entry> {
- typedef base::FileUtilProxy::Entry param_type;
- static void Write(Message* m, const param_type& p);
- static bool Read(const Message* m, void** iter, param_type* p);
- static void Log(const param_type& p, std::string* l);
-};
-
-template <>
struct ParamTraits<ViewHostMsg_AccessibilityNotification_Params> {
typedef ViewHostMsg_AccessibilityNotification_Params param_type;
static void Write(Message* m, const param_type& p);