diff options
43 files changed, 63 insertions, 63 deletions
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 01a43400..3e9d181 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -14,7 +14,6 @@ #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/geoposition.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" #include "content/browser/geolocation/arbitrator_dependency_factories_for_test.h" @@ -22,6 +21,7 @@ #include "content/browser/geolocation/mock_location_provider.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/geoposition.h" #include "content/common/notification_details.h" #include "content/common/notification_service.h" #include "content/common/notification_type.h" diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h index f178ce3..9b22cf8 100644 --- a/chrome/browser/history/history_backend.h +++ b/chrome/browser/history/history_backend.h @@ -21,7 +21,7 @@ #include "chrome/browser/history/thumbnail_database.h" #include "chrome/browser/history/visit_tracker.h" #include "chrome/browser/search_engines/template_url_id.h" -#include "chrome/common/mru_cache.h" +#include "content/common/mru_cache.h" class BookmarkService; struct DownloadCreateInfo; diff --git a/chrome/browser/history/text_database_manager.cc b/chrome/browser/history/text_database_manager.cc index c23158e..e884ec1 100644 --- a/chrome/browser/history/text_database_manager.cc +++ b/chrome/browser/history/text_database_manager.cc @@ -13,7 +13,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/history/history_publisher.h" #include "chrome/browser/history/visit_database.h" -#include "chrome/common/mru_cache.h" +#include "content/common/mru_cache.h" using base::Time; using base::TimeDelta; diff --git a/chrome/browser/history/text_database_manager.h b/chrome/browser/history/text_database_manager.h index 673046f..50cfeb5 100644 --- a/chrome/browser/history/text_database_manager.h +++ b/chrome/browser/history/text_database_manager.h @@ -18,7 +18,7 @@ #include "chrome/browser/history/text_database.h" #include "chrome/browser/history/query_parser.h" #include "chrome/browser/history/url_database.h" -#include "chrome/common/mru_cache.h" +#include "content/common/mru_cache.h" struct sqlite3; diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 4cb5a9a..b6b5601 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -51,10 +51,6 @@ 'common/content_settings_types.h', 'common/devtools_messages.cc', 'common/devtools_messages.h', - 'common/font_config_ipc_linux.cc', - 'common/font_config_ipc_linux.h', - 'common/geoposition.cc', - 'common/geoposition.h', 'common/gfx_resource_provider.cc', 'common/gfx_resource_provider.h', 'common/guid.cc', @@ -94,8 +90,6 @@ 'common/switch_utils.h', 'common/time_format.cc', 'common/time_format.h', - 'common/unix_domain_socket_posix.cc', - 'common/unix_domain_socket_posix.h', 'common/win_safe_util.cc', 'common/win_safe_util.h', ], @@ -165,8 +159,6 @@ 'common/default_plugin.h', 'common/deprecated/event_sys-inl.h', 'common/deprecated/event_sys.h', - 'common/desktop_notifications/active_notification_tracker.cc', - 'common/desktop_notifications/active_notification_tracker.h', 'common/extensions/extension.cc', 'common/extensions/extension.h', 'common/extensions/extension_action.cc', @@ -212,7 +204,6 @@ 'common/jstemplate_builder.h', 'common/libxml_utils.cc', 'common/libxml_utils.h', - 'common/mru_cache.h', 'common/native_web_keyboard_event.h', 'common/native_web_keyboard_event_linux.cc', 'common/native_web_keyboard_event_mac.mm', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 9afc613..164dbdd 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1711,7 +1711,6 @@ 'common/common_param_traits_unittest.cc', 'common/content_settings_helper_unittest.cc', 'common/deprecated/event_sys_unittest.cc', - 'common/desktop_notifications/active_notification_tracker_unittest.cc', 'common/extensions/extension_action_unittest.cc', 'common/extensions/extension_extent_unittest.cc', 'common/extensions/extension_file_util_unittest.cc', @@ -1734,7 +1733,6 @@ 'common/json_schema_validator_unittest_base.h', 'common/json_schema_validator_unittest.cc', 'common/json_value_serializer_unittest.cc', - 'common/mru_cache_unittest.cc', 'common/multi_process_lock_unittest.cc', 'common/net/gaia/gaia_auth_fetcher_unittest.cc', 'common/net/gaia/gaia_auth_fetcher_unittest.h', @@ -1825,6 +1823,7 @@ '../content/common/font_descriptor_mac_unittest.mm', '../content/common/gpu_feature_flags_unittest.cc', '../content/common/gpu_info_unittest.cc', + '../content/common/mru_cache_unittest.cc', '../content/common/notification_service_unittest.cc', '../content/common/property_bag_unittest.cc', '../content/common/resource_dispatcher_unittest.cc', @@ -1838,6 +1837,7 @@ '../content/gpu/gpu_info_collector_unittest.cc', '../content/gpu/gpu_info_unittest_win.cc', '../content/gpu/gpu_video_decoder_unittest.cc', + '../content/renderer/active_notification_tracker_unittest.cc', '../content/renderer/audio_message_filter_unittest.cc', '../content/renderer/media/audio_renderer_impl_unittest.cc', '../testing/gtest_mac_unittest.mm', diff --git a/chrome/common/common_param_traits.cc b/chrome/common/common_param_traits.cc index 6297e641..6c0fc25 100644 --- a/chrome/common/common_param_traits.cc +++ b/chrome/common/common_param_traits.cc @@ -7,10 +7,10 @@ #include "base/time.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/content_settings.h" -#include "chrome/common/geoposition.h" #include "chrome/common/thumbnail_score.h" #include "chrome/common/web_apps.h" #include "content/common/common_param_traits.h" +#include "content/common/geoposition.h" #include "googleurl/src/gurl.h" #include "printing/backend/print_backend.h" #include "printing/native_metafile.h" diff --git a/chrome/common/common_param_traits_unittest.cc b/chrome/common/common_param_traits_unittest.cc index 20387d0..7928032 100644 --- a/chrome/common/common_param_traits_unittest.cc +++ b/chrome/common/common_param_traits_unittest.cc @@ -8,8 +8,8 @@ #include "base/scoped_ptr.h" #include "base/values.h" #include "chrome/common/common_param_traits.h" -#include "chrome/common/geoposition.h" #include "content/common/common_param_traits.h" +#include "content/common/geoposition.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_utils.h" diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index db74cb8..e34f1e9 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -28,7 +28,6 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_extent.h" #include "chrome/common/extensions/url_pattern.h" -#include "chrome/common/geoposition.h" #include "chrome/common/instant_types.h" #include "chrome/common/nacl_types.h" #include "chrome/common/page_transition_types.h" @@ -41,6 +40,7 @@ #include "chrome/common/webkit_param_traits.h" #include "chrome/common/window_container_type.h" #include "content/common/common_param_traits.h" +#include "content/common/geoposition.h" #include "content/common/notification_type.h" #include "content/common/resource_response.h" #include "ipc/ipc_channel_handle.h" diff --git a/chrome/renderer/renderer_sandbox_support_linux.cc b/chrome/renderer/renderer_sandbox_support_linux.cc index f71f52d..c99d996 100644 --- a/chrome/renderer/renderer_sandbox_support_linux.cc +++ b/chrome/renderer/renderer_sandbox_support_linux.cc @@ -12,7 +12,7 @@ #include "base/scoped_ptr.h" #include "chrome/common/chrome_descriptors.h" #include "chrome/common/sandbox_methods_linux.h" -#include "chrome/common/unix_domain_socket_posix.h" +#include "content/common/unix_domain_socket_posix.h" #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontRenderStyle.h" diff --git a/content/browser/geolocation/core_location_data_provider_mac.h b/content/browser/geolocation/core_location_data_provider_mac.h index cbe0e8a..d23341f 100644 --- a/content/browser/geolocation/core_location_data_provider_mac.h +++ b/content/browser/geolocation/core_location_data_provider_mac.h @@ -12,8 +12,8 @@ #include "base/ref_counted.h" #include "base/scoped_nsobject.h" -#include "chrome/common/geoposition.h" #include "content/browser/browser_thread.h" +#include "content/common/geoposition.h" #import <Foundation/Foundation.h> diff --git a/content/browser/geolocation/core_location_provider_mac.h b/content/browser/geolocation/core_location_provider_mac.h index d9b1263..d26428d 100644 --- a/content/browser/geolocation/core_location_provider_mac.h +++ b/content/browser/geolocation/core_location_provider_mac.h @@ -10,8 +10,8 @@ #define CONTENT_BROWSER_GEOLOCATION_CORE_LOCATION_PROVIDER_MAC_H_ #pragma once -#include "chrome/common/geoposition.h" #include "content/browser/geolocation/location_provider.h" +#include "content/common/geoposition.h" class CoreLocationDataProviderMac; diff --git a/content/browser/geolocation/geolocation_dispatcher_host.cc b/content/browser/geolocation/geolocation_dispatcher_host.cc index 3d4cd5b..33193d3 100644 --- a/content/browser/geolocation/geolocation_dispatcher_host.cc +++ b/content/browser/geolocation/geolocation_dispatcher_host.cc @@ -8,13 +8,13 @@ #include <set> #include <utility> -#include "chrome/common/geoposition.h" #include "chrome/common/render_messages.h" #include "content/browser/geolocation/geolocation_permission_context.h" #include "content/browser/geolocation/geolocation_provider.h" #include "content/browser/renderer_host/render_message_filter.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" +#include "content/common/geoposition.h" namespace { class GeolocationDispatcherHostImpl : public GeolocationDispatcherHost, diff --git a/content/browser/geolocation/geolocation_provider.h b/content/browser/geolocation/geolocation_provider.h index 45e63e6..aaf398e 100644 --- a/content/browser/geolocation/geolocation_provider.h +++ b/content/browser/geolocation/geolocation_provider.h @@ -9,8 +9,8 @@ #include <map> #include "base/threading/thread.h" -#include "chrome/common/geoposition.h" #include "content/browser/geolocation/geolocation_observer.h" +#include "content/common/geoposition.h" #include "googleurl/src/gurl.h" class GeolocationArbitrator; diff --git a/content/browser/geolocation/gps_location_provider_linux.h b/content/browser/geolocation/gps_location_provider_linux.h index 43b980d..f923dd1 100644 --- a/content/browser/geolocation/gps_location_provider_linux.h +++ b/content/browser/geolocation/gps_location_provider_linux.h @@ -13,8 +13,8 @@ #include "base/scoped_ptr.h" #include "base/task.h" -#include "chrome/common/geoposition.h" #include "content/browser/geolocation/location_provider.h" +#include "content/common/geoposition.h" class LibGps; diff --git a/content/browser/geolocation/libgps_2_38_wrapper_linux.cc b/content/browser/geolocation/libgps_2_38_wrapper_linux.cc index bb49889..7cfdb52 100644 --- a/content/browser/geolocation/libgps_2_38_wrapper_linux.cc +++ b/content/browser/geolocation/libgps_2_38_wrapper_linux.cc @@ -11,7 +11,7 @@ #include <sys/time.h> #include "base/logging.h" -#include "chrome/common/geoposition.h" +#include "content/common/geoposition.h" #include "third_party/gpsd/release-2.38/gps.h" class LibGpsV238 : public LibGps { diff --git a/content/browser/geolocation/libgps_2_94_wrapper_linux.cc b/content/browser/geolocation/libgps_2_94_wrapper_linux.cc index f2f1198..c9fb1bd 100644 --- a/content/browser/geolocation/libgps_2_94_wrapper_linux.cc +++ b/content/browser/geolocation/libgps_2_94_wrapper_linux.cc @@ -7,7 +7,7 @@ #include "content/browser/geolocation/libgps_wrapper_linux.h" #include "base/logging.h" -#include "chrome/common/geoposition.h" +#include "content/common/geoposition.h" #include "third_party/gpsd/release-2.94/gps.h" class LibGpsV294 : public LibGps { diff --git a/content/browser/geolocation/libgps_wrapper_linux.cc b/content/browser/geolocation/libgps_wrapper_linux.cc index bf14005..d09ea01 100644 --- a/content/browser/geolocation/libgps_wrapper_linux.cc +++ b/content/browser/geolocation/libgps_wrapper_linux.cc @@ -7,9 +7,9 @@ #include <dlfcn.h> #include <errno.h> -#include "chrome/common/geoposition.h" #include "base/logging.h" #include "base/string_util.h" +#include "content/common/geoposition.h" namespace { // Pass to TryToOpen() to indicate which functions should be wired up. diff --git a/content/browser/geolocation/location_arbitrator.h b/content/browser/geolocation/location_arbitrator.h index e3bb12b..75481ca 100644 --- a/content/browser/geolocation/location_arbitrator.h +++ b/content/browser/geolocation/location_arbitrator.h @@ -9,11 +9,11 @@ #include "base/string16.h" #include "base/scoped_vector.h" #include "base/time.h" -#include "chrome/common/geoposition.h" #include "chrome/common/net/url_request_context_getter.h" #include "content/browser/geolocation/access_token_store.h" #include "content/browser/geolocation/location_provider.h" #include "content/browser/geolocation/geolocation_observer.h" +#include "content/common/geoposition.h" #include "googleurl/src/gurl.h" class AccessTokenStore; diff --git a/content/browser/geolocation/location_arbitrator_unittest.cc b/content/browser/geolocation/location_arbitrator_unittest.cc index bd73a10..69c85c4a 100644 --- a/content/browser/geolocation/location_arbitrator_unittest.cc +++ b/content/browser/geolocation/location_arbitrator_unittest.cc @@ -3,13 +3,13 @@ // found in the LICENSE file. #include "base/scoped_ptr.h" -#include "chrome/common/geoposition.h" #include "content/browser/geolocation/arbitrator_dependency_factory.h" #include "content/browser/geolocation/fake_access_token_store.h" #include "content/browser/geolocation/geolocation_observer.h" #include "content/browser/geolocation/location_arbitrator.h" #include "content/browser/geolocation/location_provider.h" #include "content/browser/geolocation/mock_location_provider.h" +#include "content/common/geoposition.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/content/browser/geolocation/mock_location_provider.h b/content/browser/geolocation/mock_location_provider.h index c983f58..c11367b 100644 --- a/content/browser/geolocation/mock_location_provider.h +++ b/content/browser/geolocation/mock_location_provider.h @@ -10,8 +10,8 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/threading/thread.h" -#include "chrome/common/geoposition.h" #include "content/browser/geolocation/location_provider.h" +#include "content/common/geoposition.h" #include "googleurl/src/gurl.h" // Mock implementation of a location provider for testing. diff --git a/content/browser/geolocation/network_location_provider.h b/content/browser/geolocation/network_location_provider.h index c105ac6..4a9abd6 100644 --- a/content/browser/geolocation/network_location_provider.h +++ b/content/browser/geolocation/network_location_provider.h @@ -14,10 +14,10 @@ #include "base/scoped_ptr.h" #include "base/string16.h" #include "base/threading/thread.h" -#include "chrome/common/geoposition.h" #include "content/browser/geolocation/device_data_provider.h" #include "content/browser/geolocation/location_provider.h" #include "content/browser/geolocation/network_location_request.h" +#include "content/common/geoposition.h" class URLFetcherProtectEntry; diff --git a/content/browser/geolocation/network_location_request.cc b/content/browser/geolocation/network_location_request.cc index 6c96c2e..ec02d18 100644 --- a/content/browser/geolocation/network_location_request.cc +++ b/content/browser/geolocation/network_location_request.cc @@ -9,8 +9,8 @@ #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/geoposition.h" #include "chrome/common/net/url_request_context_getter.h" +#include "content/common/geoposition.h" #include "net/base/load_flags.h" #include "net/url_request/url_request_status.h" diff --git a/content/browser/geolocation/win7_location_api_win.cc b/content/browser/geolocation/win7_location_api_win.cc index c14c16b..a8fab77 100644 --- a/content/browser/geolocation/win7_location_api_win.cc +++ b/content/browser/geolocation/win7_location_api_win.cc @@ -11,7 +11,7 @@ #include "base/path_service.h" #include "base/scoped_ptr.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/geoposition.h" +#include "content/common/geoposition.h" namespace { const double kKnotsToMetresPerSecondConversionFactor = 0.5144; diff --git a/content/browser/geolocation/win7_location_provider_win.h b/content/browser/geolocation/win7_location_provider_win.h index 33f2818..ce44828 100644 --- a/content/browser/geolocation/win7_location_provider_win.h +++ b/content/browser/geolocation/win7_location_provider_win.h @@ -9,7 +9,7 @@ #include "base/task.h" #include "content/browser/geolocation/location_provider.h" #include "content/browser/geolocation/win7_location_api_win.h" -#include "chrome/common/geoposition.h" +#include "content/common/geoposition.h" // Location provider for Windows 7 that uses the Location and Sensors platform // to obtain position fixes. diff --git a/content/browser/renderer_host/backing_store_manager.cc b/content/browser/renderer_host/backing_store_manager.cc index a725243..7247da0 100644 --- a/content/browser/renderer_host/backing_store_manager.cc +++ b/content/browser/renderer_host/backing_store_manager.cc @@ -8,9 +8,9 @@ #include "base/sys_info.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/mru_cache.h" #include "content/browser/renderer_host/backing_store.h" #include "content/browser/renderer_host/render_widget_host.h" +#include "content/common/mru_cache.h" #include "content/common/notification_service.h" namespace { diff --git a/content/browser/renderer_host/render_sandbox_host_linux.cc b/content/browser/renderer_host/render_sandbox_host_linux.cc index 4499d77..3fca5127 100644 --- a/content/browser/renderer_host/render_sandbox_host_linux.cc +++ b/content/browser/renderer_host/render_sandbox_host_linux.cc @@ -26,9 +26,9 @@ #include "base/singleton.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "chrome/common/font_config_ipc_linux.h" #include "chrome/common/sandbox_methods_linux.h" -#include "chrome/common/unix_domain_socket_posix.h" +#include "content/common/font_config_ipc_linux.h" +#include "content/common/unix_domain_socket_posix.h" #include "skia/ext/SkFontHost_fontconfig_direct.h" #include "third_party/npapi/bindings/npapi_extensions.h" #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebFontInfo.h" diff --git a/content/browser/zygote_host_linux.cc b/content/browser/zygote_host_linux.cc index 9152f9f..1eee6f3 100644 --- a/content/browser/zygote_host_linux.cc +++ b/content/browser/zygote_host_linux.cc @@ -25,8 +25,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/process_watcher.h" #include "chrome/common/result_codes.h" -#include "chrome/common/unix_domain_socket_posix.h" #include "content/browser/renderer_host/render_sandbox_host_linux.h" +#include "content/common/unix_domain_socket_posix.h" #include "sandbox/linux/suid/suid_unsafe_environment_variables.h" static void SaveSUIDUnsafeEnvironmentVariables() { diff --git a/content/browser/zygote_main_linux.cc b/content/browser/zygote_main_linux.cc index b56a8a0..b8fde82 100644 --- a/content/browser/zygote_main_linux.cc +++ b/content/browser/zygote_main_linux.cc @@ -38,14 +38,14 @@ #include "build/build_config.h" #include "chrome/common/chrome_descriptors.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/font_config_ipc_linux.h" #include "chrome/common/pepper_plugin_registry.h" #include "chrome/common/process_watcher.h" #include "chrome/common/result_codes.h" #include "chrome/common/sandbox_methods_linux.h" #include "chrome/common/set_process_title.h" -#include "chrome/common/unix_domain_socket_posix.h" +#include "content/common/font_config_ipc_linux.h" #include "content/common/main_function_params.h" +#include "content/common/unix_domain_socket_posix.h" #include "media/base/media.h" #include "seccompsandbox/sandbox.h" #include "skia/ext/SkFontHost_fontconfig_control.h" diff --git a/chrome/common/font_config_ipc_linux.cc b/content/common/font_config_ipc_linux.cc index a2e86a9..c7c6073 100644 --- a/chrome/common/font_config_ipc_linux.cc +++ b/content/common/font_config_ipc_linux.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/font_config_ipc_linux.h" +#include "content/common/font_config_ipc_linux.h" #include <errno.h> #include <unistd.h> @@ -11,7 +11,7 @@ #include <sys/uio.h> #include "base/pickle.h" -#include "chrome/common/unix_domain_socket_posix.h" +#include "content/common/unix_domain_socket_posix.h" FontConfigIPC::FontConfigIPC(int fd) : fd_(fd) { diff --git a/chrome/common/font_config_ipc_linux.h b/content/common/font_config_ipc_linux.h index e478f6a..4873c14 100644 --- a/chrome/common/font_config_ipc_linux.h +++ b/content/common/font_config_ipc_linux.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_FONT_CONFIG_IPC_LINUX_H_ -#define CHROME_COMMON_FONT_CONFIG_IPC_LINUX_H_ +#ifndef CONTENT_COMMON_FONT_CONFIG_IPC_LINUX_H_ +#define CONTENT_COMMON_FONT_CONFIG_IPC_LINUX_H_ #pragma once #include "skia/ext/SkFontHost_fontconfig_impl.h" @@ -37,4 +37,4 @@ class FontConfigIPC : public FontConfigInterface { const int fd_; }; -#endif // CHROME_COMMON_FONT_CONFIG_IPC_LINUX_H_ +#endif // CONTENT_COMMON_FONT_CONFIG_IPC_LINUX_H_ diff --git a/chrome/common/geoposition.cc b/content/common/geoposition.cc index e3a2020..4beac74 100644 --- a/chrome/common/geoposition.cc +++ b/content/common/geoposition.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/geoposition.h" +#include "content/common/geoposition.h" namespace { // Sentinel values to mark invalid data. (WebKit carries companion is_valid diff --git a/chrome/common/geoposition.h b/content/common/geoposition.h index 6b19275..9f8f14e 100644 --- a/chrome/common/geoposition.h +++ b/content/common/geoposition.h @@ -6,8 +6,8 @@ // position fix. Originally derived from // http://gears.googlecode.com/svn/trunk/gears/geolocation/geolocation.h -#ifndef CHROME_COMMON_GEOPOSITION_H_ -#define CHROME_COMMON_GEOPOSITION_H_ +#ifndef CONTENT_COMMON_GEOPOSITION_H_ +#define CONTENT_COMMON_GEOPOSITION_H_ #pragma once #include <string> @@ -62,4 +62,4 @@ struct Geoposition { std::string error_message; // Human-readable error message }; -#endif // CHROME_COMMON_GEOPOSITION_H_ +#endif // CONTENT_COMMON_GEOPOSITION_H_ diff --git a/chrome/common/mru_cache.h b/content/common/mru_cache.h index b9b72d4..4c55576 100644 --- a/chrome/common/mru_cache.h +++ b/content/common/mru_cache.h @@ -13,8 +13,8 @@ // legibility rather than optimality. If future profiling identifies this as // a bottleneck, there is room for smaller values of 1 in the O(1). :] -#ifndef CHROME_COMMON_MRU_CACHE_H__ -#define CHROME_COMMON_MRU_CACHE_H__ +#ifndef CONTENT_COMMON_MRU_CACHE_H_ +#define CONTENT_COMMON_MRU_CACHE_H_ #pragma once #include <list> @@ -250,4 +250,4 @@ class OwningMRUCache DISALLOW_COPY_AND_ASSIGN(OwningMRUCache); }; -#endif // CHROME_COMMON_MRU_CACHE_H__ +#endif // CONTENT_COMMON_MRU_CACHE_H_ diff --git a/chrome/common/mru_cache_unittest.cc b/content/common/mru_cache_unittest.cc index 7cfb7d8..bd18ffe 100644 --- a/chrome/common/mru_cache_unittest.cc +++ b/content/common/mru_cache_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "chrome/common/mru_cache.h" +#include "content/common/mru_cache.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/common/unix_domain_socket_posix.cc b/content/common/unix_domain_socket_posix.cc index 6bd387b..17e8b25 100644 --- a/chrome/common/unix_domain_socket_posix.cc +++ b/content/common/unix_domain_socket_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/unix_domain_socket_posix.h" +#include "content/common/unix_domain_socket_posix.h" #include <errno.h> #include <unistd.h> diff --git a/chrome/common/unix_domain_socket_posix.h b/content/common/unix_domain_socket_posix.h index 405ca95..182cc45 100644 --- a/chrome/common/unix_domain_socket_posix.h +++ b/content/common/unix_domain_socket_posix.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_UNIX_DOMAIN_SOCKET_POSIX_H_ -#define CHROME_COMMON_UNIX_DOMAIN_SOCKET_POSIX_H_ +#ifndef CONTENT_COMMON_UNIX_DOMAIN_SOCKET_POSIX_H_ +#define CONTENT_COMMON_UNIX_DOMAIN_SOCKET_POSIX_H_ #pragma once #include <stdint.h> @@ -51,4 +51,4 @@ class UnixDomainSocket { const Pickle& request); }; -#endif // CHROME_COMMON_UNIX_DOMAIN_SOCKET_POSIX_H_ +#endif // CONTENT_COMMON_UNIX_DOMAIN_SOCKET_POSIX_H_ diff --git a/content/content_common.gypi b/content/content_common.gypi index 488c2227c..f35ba7e 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -71,12 +71,16 @@ 'common/file_system/webfilewriter_impl.h', 'common/file_system_messages.h', 'common/file_utilities_messages.h', + 'common/font_config_ipc_linux.cc', + 'common/font_config_ipc_linux.h', 'common/font_descriptor_mac.h', 'common/font_descriptor_mac.mm', 'common/font_loader_mac.h', 'common/font_loader_mac.mm', 'common/gpu_feature_flags.cc', 'common/gpu_feature_flags.h', + 'common/geoposition.cc', + 'common/geoposition.h', 'common/gpu_info.cc', 'common/gpu_info.h', 'common/gpu_messages.h', @@ -92,6 +96,7 @@ 'common/message_router.cc', 'common/message_router.h', 'common/mime_registry_messages.h', + 'common/mru_cache.h', 'common/notification_details.cc', 'common/notification_details.h', 'common/notification_observer.h', @@ -134,6 +139,8 @@ 'common/socket_stream_messages.h', 'common/speech_input_messages.h', 'common/speech_input_result.h', + 'common/unix_domain_socket_posix.cc', + 'common/unix_domain_socket_posix.h', 'common/web_database_observer_impl.cc', 'common/web_database_observer_impl.h', 'common/webblobregistry_impl.cc', diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index cfed384..ee7bbf1 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -18,6 +18,8 @@ '..', ], 'sources': [ + 'renderer/active_notification_tracker.cc', + 'renderer/active_notification_tracker.h', 'renderer/audio_device.cc', 'renderer/audio_device.h', 'renderer/audio_message_filter.cc', diff --git a/chrome/common/desktop_notifications/active_notification_tracker.cc b/content/renderer/active_notification_tracker.cc index 3603103..8a560ea 100644 --- a/chrome/common/desktop_notifications/active_notification_tracker.cc +++ b/content/renderer/active_notification_tracker.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/desktop_notifications/active_notification_tracker.h" +#include "content/renderer/active_notification_tracker.h" #include "base/message_loop.h" #include "base/scoped_ptr.h" diff --git a/chrome/common/desktop_notifications/active_notification_tracker.h b/content/renderer/active_notification_tracker.h index 9610ce4..7cfb5ae 100644 --- a/chrome/common/desktop_notifications/active_notification_tracker.h +++ b/content/renderer/active_notification_tracker.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_DESKTOP_NOTIFICATIONS_ACTIVE_NOTIFICATION_TRACKER_H_ -#define CHROME_COMMON_DESKTOP_NOTIFICATIONS_ACTIVE_NOTIFICATION_TRACKER_H_ +#ifndef CONTENT_RENDERER_ACTIVE_NOTIFICATION_TRACKER_H_ +#define CONTENT_RENDERER_ACTIVE_NOTIFICATION_TRACKER_H_ #pragma once #include <map> @@ -55,4 +55,4 @@ class ActiveNotificationTracker { DISALLOW_COPY_AND_ASSIGN(ActiveNotificationTracker); }; -#endif // CHROME_COMMON_DESKTOP_NOTIFICATIONS_ACTIVE_NOTIFICATION_TRACKER_H_ +#endif // CONTENT_RENDERER_ACTIVE_NOTIFICATION_TRACKER_H_ diff --git a/chrome/common/desktop_notifications/active_notification_tracker_unittest.cc b/content/renderer/active_notification_tracker_unittest.cc index b741d35..18a7850 100644 --- a/chrome/common/desktop_notifications/active_notification_tracker_unittest.cc +++ b/content/renderer/active_notification_tracker_unittest.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/desktop_notifications/active_notification_tracker.h" +#include "content/renderer/active_notification_tracker.h" #include "testing/gtest/include/gtest/gtest.h" TEST(ActiveNotificationTrackerTest, TestLookupAndClear) { diff --git a/content/renderer/notification_provider.h b/content/renderer/notification_provider.h index 32abdee..4d641a8 100644 --- a/content/renderer/notification_provider.h +++ b/content/renderer/notification_provider.h @@ -6,8 +6,8 @@ #define CONTENT_RENDERER_NOTIFICATION_PROVIDER_H_ #pragma once -#include "chrome/common/desktop_notifications/active_notification_tracker.h" #include "chrome/renderer/render_view_observer.h" +#include "content/renderer/active_notification_tracker.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotification.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" |