diff options
20 files changed, 30 insertions, 30 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 4f14f14..8b3cb1b 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -78,7 +78,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/env_vars.h" #include "chrome/common/gfx_resource_provider.h" -#include "chrome/common/hi_res_timer_manager.h" #include "chrome/common/json_pref_store.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/logging_chrome.h" @@ -91,6 +90,7 @@ #include "content/browser/plugin_service.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/common/child_process.h" +#include "content/common/hi_res_timer_manager.h" #include "content/common/main_function_params.h" #include "grit/app_locale_settings.h" #include "grit/chromium_strings.h" diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index b48c8cf..f8b6584 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -56,7 +56,6 @@ 'common/devtools_messages_internal.h', 'common/dom_storage_messages.cc', 'common/dom_storage_messages.h', - 'common/file_utilities_messages.h', 'common/font_config_ipc_linux.cc', 'common/font_config_ipc_linux.h', 'common/geoposition.cc', @@ -69,9 +68,6 @@ 'common/guid.h', 'common/guid_posix.cc', 'common/guid_win.cc', - 'common/hi_res_timer_manager_posix.cc', - 'common/hi_res_timer_manager_win.cc', - 'common/hi_res_timer_manager.h', 'common/indexed_db_key.cc', 'common/indexed_db_key.h', 'common/indexed_db_messages.h', @@ -82,7 +78,6 @@ 'common/logging_chrome.h', 'common/metrics_helpers.cc', 'common/metrics_helpers.h', - 'common/mime_registry_messages.h', 'common/multi_process_lock.h', 'common/multi_process_lock_linux.cc', 'common/multi_process_lock_mac.cc', diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index eb0ed41..94d3af5 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -603,6 +603,7 @@ '../content/common/content_paths.cc', '../content/common/content_switches.cc', '../content/common/debug_flags.cc', + '../content/common/hi_res_timer_manager_win.cc', '../content/common/notification_details.cc', '../content/common/notification_service.cc', '../content/common/notification_source.cc', diff --git a/chrome/common/common_message_generator.h b/chrome/common/common_message_generator.h index bc07d72..bd1fffb 100644 --- a/chrome/common/common_message_generator.h +++ b/chrome/common/common_message_generator.h @@ -7,9 +7,7 @@ #include "chrome/common/autofill_messages.h" #include "chrome/common/clipboard_messages.h" #include "chrome/common/database_messages.h" -#include "chrome/common/file_utilities_messages.h" #include "chrome/common/indexed_db_messages.h" -#include "chrome/common/mime_registry_messages.h" #include "chrome/common/safebrowsing_messages.h" #include "chrome/common/speech_input_messages.h" #include "chrome/common/utility_messages.h" diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc index b026c78..4895b26 100644 --- a/chrome/nacl/nacl_main.cc +++ b/chrome/nacl/nacl_main.cc @@ -13,13 +13,13 @@ #include "base/string_util.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/hi_res_timer_manager.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/result_codes.h" #include "chrome/common/sandbox_policy.h" #include "chrome/nacl/nacl_main_platform_delegate.h" #include "chrome/nacl/nacl_thread.h" #include "content/common/child_process.h" +#include "content/common/hi_res_timer_manager.h" #include "content/common/main_function_params.h" #include "ui/base/system_monitor/system_monitor.h" diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc index a3e9174..02eb35d 100644 --- a/chrome/plugin/plugin_main.cc +++ b/chrome/plugin/plugin_main.cc @@ -16,10 +16,10 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/default_plugin.h" -#include "chrome/common/hi_res_timer_manager.h" #include "chrome/common/logging_chrome.h" #include "chrome/plugin/plugin_thread.h" #include "content/common/child_process.h" +#include "content/common/hi_res_timer_manager.h" #include "content/common/main_function_params.h" #include "ui/base/system_monitor/system_monitor.h" diff --git a/chrome/renderer/renderer_main.cc b/chrome/renderer/renderer_main.cc index 985350b..d465e54 100644 --- a/chrome/renderer/renderer_main.cc +++ b/chrome/renderer/renderer_main.cc @@ -23,7 +23,6 @@ #include "chrome/common/chrome_counters.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/gfx_resource_provider.h" -#include "chrome/common/hi_res_timer_manager.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/net/net_resource_provider.h" #include "chrome/common/pepper_plugin_registry.h" @@ -31,6 +30,7 @@ #include "chrome/renderer/render_process_impl.h" #include "chrome/renderer/render_thread.h" #include "content/common/main_function_params.h" +#include "content/common/hi_res_timer_manager.h" #include "grit/generated_resources.h" #include "net/base/net_module.h" #include "ui/base/system_monitor/system_monitor.h" diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc index 542bb21..a818fc35 100644 --- a/chrome/renderer/renderer_webkitclient_impl.cc +++ b/chrome/renderer/renderer_webkitclient_impl.cc @@ -11,8 +11,6 @@ #include "base/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/database_util.h" -#include "chrome/common/file_utilities_messages.h" -#include "chrome/common/mime_registry_messages.h" #include "chrome/common/render_messages.h" #include "chrome/common/webblobregistry_impl.h" #include "chrome/common/webmessageportchannel_impl.h" @@ -27,6 +25,8 @@ #include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h" #include "chrome/renderer/websharedworkerrepository_impl.h" #include "content/common/file_system/webfilesystem_impl.h" +#include "content/common/file_utilities_messages.h" +#include "content/common/mime_registry_messages.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_sync_message_filter.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h" diff --git a/chrome/utility/utility_main.cc b/chrome/utility/utility_main.cc index ef84260..ccf3bd5 100644 --- a/chrome/utility/utility_main.cc +++ b/chrome/utility/utility_main.cc @@ -12,10 +12,10 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_l10n_util.h" -#include "chrome/common/hi_res_timer_manager.h" #include "chrome/common/logging_chrome.h" #include "chrome/utility/utility_thread.h" #include "content/common/child_process.h" +#include "content/common/hi_res_timer_manager.h" #include "content/common/main_function_params.h" #include "ui/base/system_monitor/system_monitor.h" #include "ui/base/ui_base_switches.h" diff --git a/chrome/worker/worker_main.cc b/chrome/worker/worker_main.cc index 82b9f27..7bab77c 100644 --- a/chrome/worker/worker_main.cc +++ b/chrome/worker/worker_main.cc @@ -7,9 +7,9 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/threading/platform_thread.h" -#include "chrome/common/hi_res_timer_manager.h" #include "chrome/worker/worker_thread.h" #include "content/common/child_process.h" +#include "content/common/hi_res_timer_manager.h" #include "content/common/main_function_params.h" #include "ui/base/system_monitor/system_monitor.h" diff --git a/chrome/worker/worker_webkitclient_impl.cc b/chrome/worker/worker_webkitclient_impl.cc index a6e4407..f0f5a6d 100644 --- a/chrome/worker/worker_webkitclient_impl.cc +++ b/chrome/worker/worker_webkitclient_impl.cc @@ -7,14 +7,14 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/common/database_util.h" -#include "chrome/common/file_utilities_messages.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" -#include "chrome/common/mime_registry_messages.h" #include "chrome/common/webblobregistry_impl.h" #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/worker/worker_thread.h" #include "content/common/file_system/webfilesystem_impl.h" +#include "content/common/file_utilities_messages.h" +#include "content/common/mime_registry_messages.h" #include "ipc/ipc_sync_message_filter.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" diff --git a/content/browser/mime_registry_message_filter.cc b/content/browser/mime_registry_message_filter.cc index 3268b84..375470d 100644 --- a/content/browser/mime_registry_message_filter.cc +++ b/content/browser/mime_registry_message_filter.cc @@ -4,7 +4,7 @@ #include "content/browser/mime_registry_message_filter.h" -#include "chrome/common/mime_registry_messages.h" +#include "content/common/mime_registry_messages.h" #include "net/base/mime_util.h" MimeRegistryMessageFilter::MimeRegistryMessageFilter() { diff --git a/content/browser/renderer_host/file_utilities_message_filter.cc b/content/browser/renderer_host/file_utilities_message_filter.cc index 1971946..fe48619 100644 --- a/content/browser/renderer_host/file_utilities_message_filter.cc +++ b/content/browser/renderer_host/file_utilities_message_filter.cc @@ -5,9 +5,8 @@ #include "content/browser/renderer_host/file_utilities_message_filter.h" #include "base/file_util.h" -#include "chrome/common/file_utilities_messages.h" #include "content/browser/child_process_security_policy.h" - +#include "content/common/file_utilities_messages.h" FileUtilitiesMessageFilter::FileUtilitiesMessageFilter(int process_id) : process_id_(process_id) { diff --git a/content/common/content_message_generator.h b/content/common/content_message_generator.h index f30bc15..9d70578c 100644 --- a/content/common/content_message_generator.h +++ b/content/common/content_message_generator.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. @@ -6,8 +6,10 @@ #include "content/common/child_process_messages.h" #include "content/common/file_system_messages.h" +#include "content/common/file_utilities_messages.h" #include "content/common/p2p_messages.h" #include "content/common/gpu_messages.h" +#include "content/common/mime_registry_messages.h" #include "content/common/resource_messages.h" #include "content/common/socket_stream_messages.h" #include "content/common/worker_messages.h" diff --git a/chrome/common/file_utilities_messages.h b/content/common/file_utilities_messages.h index eb35263..f19325f 100644 --- a/chrome/common/file_utilities_messages.h +++ b/content/common/file_utilities_messages.h @@ -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. // Multiply-included message file, so no include guard. #include "base/time.h" -#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/hi_res_timer_manager.h b/content/common/hi_res_timer_manager.h index 25c02cd..0fa64f9 100644 --- a/chrome/common/hi_res_timer_manager.h +++ b/content/common/hi_res_timer_manager.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 CHROME_COMMON_HI_RES_TIMER_MANAGER_H_ -#define CHROME_COMMON_HI_RES_TIMER_MANAGER_H_ +#ifndef CONTENT_COMMON_HI_RES_TIMER_MANAGER_H_ +#define CONTENT_COMMON_HI_RES_TIMER_MANAGER_H_ #pragma once #include "ui/base/system_monitor/system_monitor.h" @@ -27,4 +27,4 @@ class HighResolutionTimerManager : public ui::SystemMonitor::PowerObserver { DISALLOW_COPY_AND_ASSIGN(HighResolutionTimerManager); }; -#endif // CHROME_COMMON_HI_RES_TIMER_MANAGER_H_ +#endif // CONTENT_COMMON_HI_RES_TIMER_MANAGER_H_ diff --git a/chrome/common/hi_res_timer_manager_posix.cc b/content/common/hi_res_timer_manager_posix.cc index fc9c1ba..63e7300 100644 --- a/chrome/common/hi_res_timer_manager_posix.cc +++ b/content/common/hi_res_timer_manager_posix.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 "chrome/common/hi_res_timer_manager.h" +#include "content/common/hi_res_timer_manager.h" // On POSIX we don't need to do anything special with the system timer. diff --git a/chrome/common/hi_res_timer_manager_win.cc b/content/common/hi_res_timer_manager_win.cc index c165222..9c86fa0 100644 --- a/chrome/common/hi_res_timer_manager_win.cc +++ b/content/common/hi_res_timer_manager_win.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 "chrome/common/hi_res_timer_manager.h" +#include "content/common/hi_res_timer_manager.h" #include "base/time.h" diff --git a/chrome/common/mime_registry_messages.h b/content/common/mime_registry_messages.h index ba6ebe4..0fd47bd 100644 --- a/chrome/common/mime_registry_messages.h +++ b/content/common/mime_registry_messages.h @@ -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. // Multiply-included message file, so no include guard. #include "base/file_path.h" -#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" diff --git a/content/content_common.gypi b/content/content_common.gypi index b71c6ab..4791a22 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -52,6 +52,7 @@ 'common/file_system/webfilewriter_impl.cc', 'common/file_system/webfilewriter_impl.h', 'common/file_system_messages.h', + 'common/file_utilities_messages.h', 'common/font_descriptor_mac.h', 'common/font_descriptor_mac.mm', 'common/font_loader_mac.h', @@ -59,9 +60,13 @@ 'common/gpu_info.cc', 'common/gpu_info.h', 'common/gpu_messages.h', + 'common/hi_res_timer_manager_posix.cc', + 'common/hi_res_timer_manager_win.cc', + 'common/hi_res_timer_manager.h', 'common/main_function_params.h', 'common/message_router.cc', 'common/message_router.h', + 'common/mime_registry_messages.h', 'common/notification_details.cc', 'common/notification_details.h', 'common/notification_observer.h', |