summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authordumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 02:28:37 +0000
committerdumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 02:28:37 +0000
commit2f0193c279b1b40a82a6ad027ec9468272eb25b2 (patch)
tree9d2e2f5bcf09837a1189723567906fb8de45c7e2 /chrome/common
parent4c56ef5fbed46794f2b16b9f8ed88ac179d65309 (diff)
downloadchromium_src-2f0193c279b1b40a82a6ad027ec9468272eb25b2.zip
chromium_src-2f0193c279b1b40a82a6ad027ec9468272eb25b2.tar.gz
chromium_src-2f0193c279b1b40a82a6ad027ec9468272eb25b2.tar.bz2
Moving file_util::FileInfo to base::PlatformFileInfo, and adding the
last_accessed and creation_time fields. BUG=none TEST=none Review URL: http://codereview.chromium.org/3347005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/common_param_traits.cc23
-rw-r--r--chrome/common/common_param_traits.h4
-rw-r--r--chrome/common/file_system/file_system_dispatcher.cc2
-rw-r--r--chrome/common/file_system/file_system_dispatcher.h6
-rw-r--r--chrome/common/render_messages_internal.h2
5 files changed, 25 insertions, 12 deletions
diff --git a/chrome/common/common_param_traits.cc b/chrome/common/common_param_traits.cc
index 0cb91a0..41a3e2f 100644
--- a/chrome/common/common_param_traits.cc
+++ b/chrome/common/common_param_traits.cc
@@ -688,26 +688,35 @@ void ParamTraits<printing::NativeMetafile>::Log(
l->append("<printing::NativeMetafile>");
}
-void ParamTraits<file_util::FileInfo>::Write(
+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<file_util::FileInfo>::Read(
+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);
- if (result)
+ 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<file_util::FileInfo>::Log(
+void ParamTraits<base::PlatformFileInfo>::Log(
const param_type& p, std::string* l) {
l->append("(");
LogParam(p.size, l);
@@ -715,6 +724,10 @@ void ParamTraits<file_util::FileInfo>::Log(
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(")");
}
diff --git a/chrome/common/common_param_traits.h b/chrome/common/common_param_traits.h
index 0a4d819..a2c5dca 100644
--- a/chrome/common/common_param_traits.h
+++ b/chrome/common/common_param_traits.h
@@ -327,8 +327,8 @@ struct ParamTraits<printing::NativeMetafile> {
};
template <>
-struct ParamTraits<file_util::FileInfo> {
- typedef file_util::FileInfo param_type;
+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);
diff --git a/chrome/common/file_system/file_system_dispatcher.cc b/chrome/common/file_system/file_system_dispatcher.cc
index f7022e1..d28e244 100644
--- a/chrome/common/file_system/file_system_dispatcher.cc
+++ b/chrome/common/file_system/file_system_dispatcher.cc
@@ -110,7 +110,7 @@ void FileSystemDispatcher::DidSucceed(int request_id) {
}
void FileSystemDispatcher::DidReadMetadata(int request_id,
- const file_util::FileInfo& file_info) {
+ const base::PlatformFileInfo& file_info) {
WebFileSystemCallbacks* callbacks = callbacks_.Lookup(request_id);
DCHECK(callbacks);
callbacks_.Remove(request_id);
diff --git a/chrome/common/file_system/file_system_dispatcher.h b/chrome/common/file_system/file_system_dispatcher.h
index 70855d1..6fb9db5 100644
--- a/chrome/common/file_system/file_system_dispatcher.h
+++ b/chrome/common/file_system/file_system_dispatcher.h
@@ -21,8 +21,8 @@ class WebFileSystemCallbacks;
struct WebFileSystemEntry;
}
-namespace file_util {
-struct FileInfo;
+namespace base {
+struct PlatformFileInfo;
}
struct ViewMsg_FileSystem_DidReadDirectory_Params;
@@ -68,7 +68,7 @@ class FileSystemDispatcher {
void DidSucceed(int request_id);
void DidReadMetadata(
int request_id,
- const file_util::FileInfo& file_info);
+ const base::PlatformFileInfo& file_info);
void DidReadDirectory(
const ViewMsg_FileSystem_DidReadDirectory_Params& params);
void DidFail(
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 14b4b4a..c9e1361 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -1032,7 +1032,7 @@ IPC_BEGIN_MESSAGES(View)
int /* request_id */)
IPC_MESSAGE_CONTROL2(ViewMsg_FileSystem_DidReadMetadata,
int /* request_id */,
- file_util::FileInfo)
+ base::PlatformFileInfo)
IPC_MESSAGE_CONTROL1(ViewMsg_FileSystem_DidReadDirectory,
ViewMsg_FileSystem_DidReadDirectory_Params)
IPC_MESSAGE_CONTROL2(ViewMsg_FileSystem_DidFail,