summaryrefslogtreecommitdiffstats
path: root/content/common
diff options
context:
space:
mode:
Diffstat (limited to 'content/common')
-rw-r--r--content/common/child_thread.cc4
-rw-r--r--content/common/content_message_generator.h4
-rw-r--r--content/common/fileapi/OWNERS (renamed from content/common/file_system/OWNERS)1
-rw-r--r--content/common/fileapi/file_system_dispatcher.cc (renamed from content/common/file_system/file_system_dispatcher.cc)4
-rw-r--r--content/common/fileapi/file_system_dispatcher.h (renamed from content/common/file_system/file_system_dispatcher.h)6
-rw-r--r--content/common/fileapi/file_system_messages.h (renamed from content/common/file_system_messages.h)0
-rw-r--r--content/common/fileapi/webblob_messages.h (renamed from content/common/webblob_messages.h)2
-rw-r--r--content/common/fileapi/webblobregistry_impl.cc (renamed from content/common/webblobregistry_impl.cc)6
-rw-r--r--content/common/fileapi/webblobregistry_impl.h (renamed from content/common/webblobregistry_impl.h)8
-rw-r--r--content/common/fileapi/webfilesystem_callback_dispatcher.cc (renamed from content/common/file_system/webfilesystem_callback_dispatcher.cc)4
-rw-r--r--content/common/fileapi/webfilesystem_callback_dispatcher.h (renamed from content/common/file_system/webfilesystem_callback_dispatcher.h)8
-rw-r--r--content/common/fileapi/webfilesystem_impl.cc (renamed from content/common/file_system/webfilesystem_impl.cc)10
-rw-r--r--content/common/fileapi/webfilesystem_impl.h (renamed from content/common/file_system/webfilesystem_impl.h)8
-rw-r--r--content/common/fileapi/webfilewriter_impl.cc (renamed from content/common/file_system/webfilewriter_impl.cc)6
-rw-r--r--content/common/fileapi/webfilewriter_impl.h (renamed from content/common/file_system/webfilewriter_impl.h)8
15 files changed, 40 insertions, 39 deletions
diff --git a/content/common/child_thread.cc b/content/common/child_thread.cc
index 39a2a4f..c4061b3 100644
--- a/content/common/child_thread.cc
+++ b/content/common/child_thread.cc
@@ -13,15 +13,15 @@
#include "content/common/child_process.h"
#include "content/common/child_process_messages.h"
#include "content/common/child_trace_message_filter.h"
-#include "content/common/file_system/file_system_dispatcher.h"
+#include "content/common/fileapi/file_system_dispatcher.h"
#include "content/common/quota_dispatcher.h"
#include "content/common/resource_dispatcher.h"
#include "content/common/socket_stream_dispatcher.h"
#include "content/public/common/content_switches.h"
#include "ipc/ipc_logging.h"
+#include "ipc/ipc_switches.h"
#include "ipc/ipc_sync_channel.h"
#include "ipc/ipc_sync_message_filter.h"
-#include "ipc/ipc_switches.h"
#include "webkit/glue/webkit_glue.h"
#if defined(OS_WIN)
diff --git a/content/common/content_message_generator.h b/content/common/content_message_generator.h
index 0b6b89e..1e6f3c5 100644
--- a/content/common/content_message_generator.h
+++ b/content/common/content_message_generator.h
@@ -15,8 +15,9 @@
#include "content/common/devtools_messages.h"
#include "content/common/dom_storage_messages.h"
#include "content/common/drag_messages.h"
-#include "content/common/file_system_messages.h"
#include "content/common/file_utilities_messages.h"
+#include "content/common/fileapi/file_system_messages.h"
+#include "content/common/fileapi/webblob_messages.h"
#include "content/common/gamepad_messages.h"
#include "content/common/geolocation_messages.h"
#include "content/common/gpu/gpu_messages.h"
@@ -38,5 +39,4 @@
#include "content/common/text_input_client_messages.h"
#include "content/common/utility_messages.h"
#include "content/common/view_messages.h"
-#include "content/common/webblob_messages.h"
#include "content/common/worker_messages.h"
diff --git a/content/common/file_system/OWNERS b/content/common/fileapi/OWNERS
index 4b079f8..f7cc33c 100644
--- a/content/common/file_system/OWNERS
+++ b/content/common/fileapi/OWNERS
@@ -1,3 +1,4 @@
ericu@chromium.org
kinuko@chromium.org
michaeln@chromium.org
+jianli@chromium.org
diff --git a/content/common/file_system/file_system_dispatcher.cc b/content/common/fileapi/file_system_dispatcher.cc
index 1257cba..0d2d2b9 100644
--- a/content/common/file_system/file_system_dispatcher.cc
+++ b/content/common/fileapi/file_system_dispatcher.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/common/file_system/file_system_dispatcher.h"
+#include "content/common/fileapi/file_system_dispatcher.h"
#include "base/file_util.h"
#include "base/process.h"
#include "content/common/child_thread.h"
-#include "content/common/file_system_messages.h"
+#include "content/common/fileapi/file_system_messages.h"
FileSystemDispatcher::FileSystemDispatcher() {
}
diff --git a/content/common/file_system/file_system_dispatcher.h b/content/common/fileapi/file_system_dispatcher.h
index 7cf469f..8da0ff3 100644
--- a/content/common/file_system/file_system_dispatcher.h
+++ b/content/common/fileapi/file_system_dispatcher.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_COMMON_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_H_
-#define CONTENT_COMMON_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_H_
+#ifndef CONTENT_COMMON_FILEAPI_FILE_SYSTEM_DISPATCHER_H_
+#define CONTENT_COMMON_FILEAPI_FILE_SYSTEM_DISPATCHER_H_
#include <string>
#include <vector>
@@ -111,4 +111,4 @@ class FileSystemDispatcher : public IPC::Channel::Listener {
DISALLOW_COPY_AND_ASSIGN(FileSystemDispatcher);
};
-#endif // CONTENT_COMMON_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_H_
+#endif // CONTENT_COMMON_FILEAPI_FILE_SYSTEM_DISPATCHER_H_
diff --git a/content/common/file_system_messages.h b/content/common/fileapi/file_system_messages.h
index 465408d..465408d 100644
--- a/content/common/file_system_messages.h
+++ b/content/common/fileapi/file_system_messages.h
diff --git a/content/common/webblob_messages.h b/content/common/fileapi/webblob_messages.h
index 7715454..0f4688d 100644
--- a/content/common/webblob_messages.h
+++ b/content/common/fileapi/webblob_messages.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/content/common/webblobregistry_impl.cc b/content/common/fileapi/webblobregistry_impl.cc
index 55f902e..924e919 100644
--- a/content/common/webblobregistry_impl.cc
+++ b/content/common/fileapi/webblobregistry_impl.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/common/webblobregistry_impl.h"
+#include "content/common/fileapi/webblobregistry_impl.h"
#include "base/memory/ref_counted.h"
#include "base/shared_memory.h"
#include "content/common/child_thread.h"
-#include "content/common/webblob_messages.h"
+#include "content/common/fileapi/webblob_messages.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobData.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
diff --git a/content/common/webblobregistry_impl.h b/content/common/fileapi/webblobregistry_impl.h
index 4079b14..c5cb9ee 100644
--- a/content/common/webblobregistry_impl.h
+++ b/content/common/fileapi/webblobregistry_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_COMMON_WEBBLOBREGISTRY_IMPL_H_
-#define CONTENT_COMMON_WEBBLOBREGISTRY_IMPL_H_
+#ifndef CONTENT_COMMON_FILEAPI_WEBBLOBREGISTRY_IMPL_H_
+#define CONTENT_COMMON_FILEAPI_WEBBLOBREGISTRY_IMPL_H_
#pragma once
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobRegistry.h"
@@ -31,4 +31,4 @@ class WebBlobRegistryImpl : public WebKit::WebBlobRegistry {
ChildThread* child_thread_;
};
-#endif // CONTENT_COMMON_WEBBLOBREGISTRY_IMPL_H_
+#endif // CONTENT_COMMON_FILEAPI_WEBBLOBREGISTRY_IMPL_H_
diff --git a/content/common/file_system/webfilesystem_callback_dispatcher.cc b/content/common/fileapi/webfilesystem_callback_dispatcher.cc
index 4ca24eb..0020f08 100644
--- a/content/common/file_system/webfilesystem_callback_dispatcher.cc
+++ b/content/common/fileapi/webfilesystem_callback_dispatcher.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/common/file_system/webfilesystem_callback_dispatcher.h"
+#include "content/common/fileapi/webfilesystem_callback_dispatcher.h"
#include <string>
#include <vector>
diff --git a/content/common/file_system/webfilesystem_callback_dispatcher.h b/content/common/fileapi/webfilesystem_callback_dispatcher.h
index fa951d5..ab9ed48 100644
--- a/content/common/file_system/webfilesystem_callback_dispatcher.h
+++ b/content/common/fileapi/webfilesystem_callback_dispatcher.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_
-#define CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_
+#ifndef CONTENT_COMMON_FILEAPI_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_
+#define CONTENT_COMMON_FILEAPI_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_
#include "base/basictypes.h"
#include "base/platform_file.h"
@@ -38,4 +38,4 @@ class WebFileSystemCallbackDispatcher
WebKit::WebFileSystemCallbacks* callbacks_;
};
-#endif // CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_
+#endif // CONTENT_COMMON_FILEAPI_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_
diff --git a/content/common/file_system/webfilesystem_impl.cc b/content/common/fileapi/webfilesystem_impl.cc
index e8f38cd..0a3f57d 100644
--- a/content/common/file_system/webfilesystem_impl.cc
+++ b/content/common/fileapi/webfilesystem_impl.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/common/file_system/webfilesystem_impl.h"
+#include "content/common/fileapi/webfilesystem_impl.h"
#include "content/common/child_thread.h"
-#include "content/common/file_system/file_system_dispatcher.h"
-#include "content/common/file_system/webfilesystem_callback_dispatcher.h"
-#include "content/common/file_system/webfilewriter_impl.h"
+#include "content/common/fileapi/file_system_dispatcher.h"
+#include "content/common/fileapi/webfilesystem_callback_dispatcher.h"
+#include "content/common/fileapi/webfilewriter_impl.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileInfo.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
diff --git a/content/common/file_system/webfilesystem_impl.h b/content/common/fileapi/webfilesystem_impl.h
index 5643f35..3d4fdbb 100644
--- a/content/common/file_system/webfilesystem_impl.h
+++ b/content/common/fileapi/webfilesystem_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_IMPL_H_
-#define CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_IMPL_H_
+#ifndef CONTENT_COMMON_FILEAPI_WEBFILESYSTEM_IMPL_H_
+#define CONTENT_COMMON_FILEAPI_WEBFILESYSTEM_IMPL_H_
#include "base/basictypes.h"
#include "base/compiler_specific.h"
@@ -63,4 +63,4 @@ class WebFileSystemImpl : public WebKit::WebFileSystem {
WebKit::WebFileSystemCallbacks*) OVERRIDE;
};
-#endif // CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_IMPL_H_
+#endif // CONTENT_COMMON_FILEAPI_WEBFILESYSTEM_IMPL_H_
diff --git a/content/common/file_system/webfilewriter_impl.cc b/content/common/fileapi/webfilewriter_impl.cc
index d42caa5..2b30f36 100644
--- a/content/common/file_system/webfilewriter_impl.cc
+++ b/content/common/fileapi/webfilewriter_impl.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/common/file_system/webfilewriter_impl.h"
+#include "content/common/fileapi/webfilewriter_impl.h"
#include "content/common/child_thread.h"
-#include "content/common/file_system/file_system_dispatcher.h"
+#include "content/common/fileapi/file_system_dispatcher.h"
namespace {
diff --git a/content/common/file_system/webfilewriter_impl.h b/content/common/fileapi/webfilewriter_impl.h
index 9c9440f..f009a57 100644
--- a/content/common/file_system/webfilewriter_impl.h
+++ b/content/common/fileapi/webfilewriter_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_COMMON_FILE_SYSTEM_WEBFILEWRITER_IMPL_H_
-#define CONTENT_COMMON_FILE_SYSTEM_WEBFILEWRITER_IMPL_H_
+#ifndef CONTENT_COMMON_FILEAPI_WEBFILEWRITER_IMPL_H_
+#define CONTENT_COMMON_FILEAPI_WEBFILEWRITER_IMPL_H_
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
@@ -28,4 +28,4 @@ class WebFileWriterImpl : public fileapi::WebFileWriterBase,
int request_id_;
};
-#endif // CONTENT_COMMON_FILE_SYSTEM_WEBFILEWRITER_IMPL_H_
+#endif // CONTENT_COMMON_FILEAPI_WEBFILEWRITER_IMPL_H_
generated by cgit v1.1 at 2025-03-04 17:00:04 +0000