diff options
16 files changed, 29 insertions, 29 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index f8b6584..648a28c 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -50,7 +50,6 @@ 'common/content_settings_helper.cc', 'common/content_settings_helper.h', 'common/content_settings_types.h', - 'common/database_messages.h', 'common/devtools_messages.cc', 'common/devtools_messages.h', 'common/devtools_messages_internal.h', @@ -192,10 +191,6 @@ 'common/chrome_descriptors.h', 'common/common_glue.cc', 'common/css_colors.h', - 'common/database_util.cc', - 'common/database_util.h', - 'common/db_message_filter.cc', - 'common/db_message_filter.h', 'common/default_plugin.cc', 'common/default_plugin.h', 'common/deprecated/event_sys-inl.h', diff --git a/chrome/common/common_message_generator.h b/chrome/common/common_message_generator.h index bd1fffb..cbd4bca 100644 --- a/chrome/common/common_message_generator.h +++ b/chrome/common/common_message_generator.h @@ -6,7 +6,6 @@ #include "chrome/common/autofill_messages.h" #include "chrome/common/clipboard_messages.h" -#include "chrome/common/database_messages.h" #include "chrome/common/indexed_db_messages.h" #include "chrome/common/safebrowsing_messages.h" #include "chrome/common/speech_input_messages.h" diff --git a/chrome/common/web_database_observer_impl.cc b/chrome/common/web_database_observer_impl.cc index bc027d0..a026838 100644 --- a/chrome/common/web_database_observer_impl.cc +++ b/chrome/common/web_database_observer_impl.cc @@ -7,7 +7,7 @@ #include "base/auto_reset.h" #include "base/message_loop.h" #include "base/string16.h" -#include "chrome/common/database_messages.h" +#include "content/common/database_messages.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index 3a59fdb..7940718 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -25,8 +25,6 @@ #include "chrome/common/appcache/appcache_dispatcher.h" #include "chrome/common/child_process_logging.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/database_messages.h" -#include "chrome/common/db_message_filter.h" #include "chrome/common/dom_storage_messages.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_localization_peer.h" @@ -66,6 +64,8 @@ #include "chrome/renderer/security_filter_peer.h" #include "chrome/renderer/spellchecker/spellcheck.h" #include "chrome/renderer/user_script_slave.h" +#include "content/common/database_messages.h" +#include "content/common/db_message_filter.h" #include "content/common/gpu_messages.h" #include "content/common/resource_dispatcher.h" #include "content/common/resource_messages.h" diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index fa75844..a4789ee 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -30,7 +30,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/clipboard_messages.h" -#include "chrome/common/database_messages.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_set.h" @@ -102,6 +101,7 @@ #include "chrome/renderer/websharedworker_proxy.h" #include "chrome/renderer/webworker_proxy.h" #include "content/common/content_constants.h" +#include "content/common/database_messages.h" #include "content/common/file_system/file_system_dispatcher.h" #include "content/common/file_system/webfilesystem_callback_dispatcher.h" #include "content/common/notification_service.h" diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc index a818fc35..6d24871 100644 --- a/chrome/renderer/renderer_webkitclient_impl.cc +++ b/chrome/renderer/renderer_webkitclient_impl.cc @@ -10,7 +10,6 @@ #include "base/shared_memory.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/database_util.h" #include "chrome/common/render_messages.h" #include "chrome/common/webblobregistry_impl.h" #include "chrome/common/webmessageportchannel_impl.h" @@ -24,6 +23,7 @@ #include "chrome/renderer/visitedlink_slave.h" #include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h" #include "chrome/renderer/websharedworkerrepository_impl.h" +#include "content/common/database_util.h" #include "content/common/file_system/webfilesystem_impl.h" #include "content/common/file_utilities_messages.h" #include "content/common/mime_registry_messages.h" diff --git a/chrome/worker/worker_thread.cc b/chrome/worker/worker_thread.cc index ef57cce..885c750 100644 --- a/chrome/worker/worker_thread.cc +++ b/chrome/worker/worker_thread.cc @@ -8,12 +8,12 @@ #include "base/lazy_instance.h" #include "base/threading/thread_local.h" #include "chrome/common/appcache/appcache_dispatcher.h" -#include "chrome/common/db_message_filter.h" #include "chrome/common/web_database_observer_impl.h" #include "chrome/worker/webworker_stub.h" #include "chrome/worker/websharedworker_stub.h" #include "chrome/worker/worker_webkitclient_impl.h" #include "content/common/content_switches.h" +#include "content/common/db_message_filter.h" #include "content/common/worker_messages.h" #include "ipc/ipc_sync_channel.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h" diff --git a/chrome/worker/worker_webkitclient_impl.cc b/chrome/worker/worker_webkitclient_impl.cc index f0f5a6d..14eca31 100644 --- a/chrome/worker/worker_webkitclient_impl.cc +++ b/chrome/worker/worker_webkitclient_impl.cc @@ -6,12 +6,12 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" -#include "chrome/common/database_util.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/common/webblobregistry_impl.h" #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/worker/worker_thread.h" +#include "content/common/database_util.h" #include "content/common/file_system/webfilesystem_impl.h" #include "content/common/file_utilities_messages.h" #include "content/common/mime_registry_messages.h" diff --git a/content/browser/renderer_host/database_message_filter.cc b/content/browser/renderer_host/database_message_filter.cc index 1e8cdb0..de2e903 100644 --- a/content/browser/renderer_host/database_message_filter.cc +++ b/content/browser/renderer_host/database_message_filter.cc @@ -11,8 +11,8 @@ #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/chrome_url_request_context.h" -#include "chrome/common/database_messages.h" #include "chrome/common/result_codes.h" +#include "content/common/database_messages.h" #include "googleurl/src/gurl.h" #include "third_party/sqlite/sqlite3.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" diff --git a/content/common/content_message_generator.h b/content/common/content_message_generator.h index 9d70578c..ea2717f 100644 --- a/content/common/content_message_generator.h +++ b/content/common/content_message_generator.h @@ -5,6 +5,7 @@ // Multiply-included file, hence no include guard. #include "content/common/child_process_messages.h" +#include "content/common/database_messages.h" #include "content/common/file_system_messages.h" #include "content/common/file_utilities_messages.h" #include "content/common/p2p_messages.h" diff --git a/chrome/common/database_messages.h b/content/common/database_messages.h index 7cf64a1..4645b7a 100644 --- a/chrome/common/database_messages.h +++ b/content/common/database_messages.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/chrome/common/database_util.cc b/content/common/database_util.cc index 2a985d3..71cd6c9 100644 --- a/chrome/common/database_util.cc +++ b/content/common/database_util.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 "chrome/common/database_util.h" +#include "content/common/database_util.h" -#include "chrome/common/database_messages.h" #include "content/common/child_thread.h" +#include "content/common/database_messages.h" #include "ipc/ipc_sync_message_filter.h" #include "third_party/sqlite/sqlite3.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" diff --git a/chrome/common/database_util.h b/content/common/database_util.h index b297044..1f78b21 100644 --- a/chrome/common/database_util.h +++ b/content/common/database_util.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 CHROME_COMMON_DATABASE_UTIL_H_ -#define CHROME_COMMON_DATABASE_UTIL_H_ +#ifndef CONTENT_COMMON_DATABASE_UTIL_H_ +#define CONTENT_COMMON_DATABASE_UTIL_H_ #pragma once #include "webkit/glue/webkitclient_impl.h" @@ -20,4 +20,4 @@ class DatabaseUtil { static long long databaseGetFileSize(const WebKit::WebString& vfs_file_name); }; -#endif // CHROME_COMMON_DATABASE_UTIL_H_ +#endif // CONTENT_COMMON_DATABASE_UTIL_H_ diff --git a/chrome/common/db_message_filter.cc b/content/common/db_message_filter.cc index 50cad70..8b86589 100644 --- a/chrome/common/db_message_filter.cc +++ b/content/common/db_message_filter.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 "chrome/common/db_message_filter.h" +#include "content/common/db_message_filter.h" -#include "chrome/common/database_messages.h" +#include "content/common/database_messages.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" diff --git a/chrome/common/db_message_filter.h b/content/common/db_message_filter.h index 1eb0d5c..40af94b 100644 --- a/chrome/common/db_message_filter.h +++ b/content/common/db_message_filter.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 CHROME_COMMON_DB_MESSAGE_FILTER_H_ -#define CHROME_COMMON_DB_MESSAGE_FILTER_H_ +#ifndef CONTENT_COMMON_DB_MESSAGE_FILTER_H_ +#define CONTENT_COMMON_DB_MESSAGE_FILTER_H_ #pragma once #include "ipc/ipc_channel_proxy.h" @@ -25,4 +25,4 @@ class DBMessageFilter : public IPC::ChannelProxy::MessageFilter { const string16& database_name); }; -#endif // CHROME_COMMON_DB_MESSAGE_FILTER_H_ +#endif // CONTENT_COMMON_DB_MESSAGE_FILTER_H_ diff --git a/content/content_common.gypi b/content/content_common.gypi index 4791a22..d23bb04 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -39,6 +39,11 @@ 'common/content_paths.h', 'common/content_switches.cc', 'common/content_switches.h', + 'common/database_messages.h', + 'common/database_util.cc', + 'common/database_util.h', + 'common/db_message_filter.cc', + 'common/db_message_filter.h', 'common/debug_flags.cc', 'common/debug_flags.h', 'common/dx_diag_node.cc', |