summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-08 18:28:39 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-08 18:30:31 +0000
commit4683ff309f1cecd209b775a7f95773eb802f322f (patch)
treef17203f689adf75ee487fc944abe263ea213ab3a /content
parent7ac632d3d954c20f826f915f7bbf9687a3484656 (diff)
downloadchromium_src-4683ff309f1cecd209b775a7f95773eb802f322f.zip
chromium_src-4683ff309f1cecd209b775a7f95773eb802f322f.tar.gz
chromium_src-4683ff309f1cecd209b775a7f95773eb802f322f.tar.bz2
content: Rename blink_glue.* to file_info_util.*.
Reason: blink_glue.* is too generic for this. It just contains a single function to convert from base::File::Info to blink::WebFileInfo. Similar to web_url_request_util.h and pepper_file_util.h. BUG=345892 TEST=None R=avi@chromium.org Review URL: https://codereview.chromium.org/455623002 Cr-Commit-Position: refs/heads/master@{#288399} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/child/file_info_util.cc (renamed from content/child/blink_glue.cc)2
-rw-r--r--content/child/file_info_util.h (renamed from content/child/blink_glue.h)11
-rw-r--r--content/child/fileapi/webfilesystem_impl.cc2
-rw-r--r--content/child/webfileutilities_impl.cc2
-rw-r--r--content/content_child.gypi4
-rw-r--r--content/renderer/renderer_webkitplatformsupport_impl.cc2
6 files changed, 11 insertions, 12 deletions
diff --git a/content/child/blink_glue.cc b/content/child/file_info_util.cc
index 9a3af75..c605adf 100644
--- a/content/child/blink_glue.cc
+++ b/content/child/file_info_util.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/child/blink_glue.h"
+#include "content/child/file_info_util.h"
#include "base/logging.h"
#include "third_party/WebKit/public/platform/WebFileInfo.h"
diff --git a/content/child/blink_glue.h b/content/child/file_info_util.h
index 0181472..82a1172 100644
--- a/content/child/blink_glue.h
+++ b/content/child/file_info_util.h
@@ -2,11 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_CHILD_BLINK_GLUE_H_
-#define CONTENT_CHILD_BLINK_GLUE_H_
+#ifndef CONTENT_CHILD_FILE_INFO_UTIL_H_
+#define CONTENT_CHILD_FILE_INFO_UTIL_H_
#include "base/files/file.h"
-#include "content/common/content_export.h"
namespace blink {
struct WebFileInfo;
@@ -15,9 +14,9 @@ struct WebFileInfo;
namespace content {
// File info conversion
-CONTENT_EXPORT void FileInfoToWebFileInfo(const base::File::Info& file_info,
- blink::WebFileInfo* web_file_info);
+void FileInfoToWebFileInfo(const base::File::Info& file_info,
+ blink::WebFileInfo* web_file_info);
} // namespace content
-#endif // CONTENT_CHILD_BLINK_GLUE_H_
+#endif // CONTENT_CHILD_FILE_INFO_UTIL_H_
diff --git a/content/child/fileapi/webfilesystem_impl.cc b/content/child/fileapi/webfilesystem_impl.cc
index dae9788..e629fdd 100644
--- a/content/child/fileapi/webfilesystem_impl.cc
+++ b/content/child/fileapi/webfilesystem_impl.cc
@@ -11,8 +11,8 @@
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread_local.h"
-#include "content/child/blink_glue.h"
#include "content/child/child_thread.h"
+#include "content/child/file_info_util.h"
#include "content/child/fileapi/file_system_dispatcher.h"
#include "content/child/fileapi/webfilewriter_impl.h"
#include "content/child/worker_task_runner.h"
diff --git a/content/child/webfileutilities_impl.cc b/content/child/webfileutilities_impl.cc
index e2f3e33..89d328b 100644
--- a/content/child/webfileutilities_impl.cc
+++ b/content/child/webfileutilities_impl.cc
@@ -7,7 +7,7 @@
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/logging.h"
-#include "content/child/blink_glue.h"
+#include "content/child/file_info_util.h"
#include "net/base/file_stream.h"
#include "net/base/filename_util.h"
#include "third_party/WebKit/public/platform/WebFileInfo.h"
diff --git a/content/content_child.gypi b/content/content_child.gypi
index 4e5784f..c2ac413 100644
--- a/content/content_child.gypi
+++ b/content/content_child.gypi
@@ -36,8 +36,6 @@
'child/appcache/web_application_cache_host_impl.cc',
'child/appcache/web_application_cache_host_impl.h',
'child/assert_matching_enums.cc',
- 'child/blink_glue.cc',
- 'child/blink_glue.h',
'child/blink_platform_impl.cc',
'child/blink_platform_impl.h',
'child/browser_font_resource_trusted.cc',
@@ -60,6 +58,8 @@
'child/database_util.h',
'child/db_message_filter.cc',
'child/db_message_filter.h',
+ 'child/file_info_util.cc',
+ 'child/file_info_util.h',
'child/fileapi/file_system_dispatcher.cc',
'child/fileapi/file_system_dispatcher.h',
'child/fileapi/webfilesystem_impl.cc',
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index be63bb3..685add7 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -14,8 +14,8 @@
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
-#include "content/child/blink_glue.h"
#include "content/child/database_util.h"
+#include "content/child/file_info_util.h"
#include "content/child/fileapi/webfilesystem_impl.h"
#include "content/child/indexed_db/webidbfactory_impl.h"
#include "content/child/npapi/npobject_util.h"