diff options
32 files changed, 45 insertions, 45 deletions
diff --git a/android_webview/common/aw_content_client.cc b/android_webview/common/aw_content_client.cc index 053215d..d6f31ef 100644 --- a/android_webview/common/aw_content_client.cc +++ b/android_webview/common/aw_content_client.cc @@ -8,7 +8,7 @@ #include "ipc/ipc_message.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "webkit/user_agent/user_agent_util.h" +#include "webkit/common/user_agent/user_agent_util.h" namespace android_webview { diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc index 5a34704..74356fe 100644 --- a/android_webview/native/aw_settings.cc +++ b/android_webview/native/aw_settings.cc @@ -14,9 +14,9 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_client.h" #include "jni/AwSettings_jni.h" +#include "webkit/common/user_agent/user_agent.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" -#include "webkit/user_agent/user_agent.h" using base::android::ConvertJavaStringToUTF16; using base::android::ConvertUTF8ToJavaString; diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index b32c863..84d57983 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -53,11 +53,11 @@ include_rules = [ "+webkit/base/origin_url_conversions.h", "+webkit/blob", "+webkit/common/plugins", # Common plugins functionality. + "+webkit/common/user_agent", "+webkit/dom_storage/dom_storage_types.h", "+webkit/fileapi", "+webkit/plugins", # Defines some types that are marshalled over IPC. "+webkit/quota", - "+webkit/user_agent", # TODO(kinuko): Remove all other webkit/* dependencies after we cleaned # up webkit/. crbug.com/239710 diff --git a/chrome/browser/chromeos/drive/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc index 3815fa9..1c91242 100644 --- a/chrome/browser/chromeos/drive/drive_integration_service.cc +++ b/chrome/browser/chromeos/drive/drive_integration_service.cc @@ -38,8 +38,8 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/storage_partition.h" #include "google/cacheinvalidation/types.pb.h" +#include "webkit/common/user_agent/user_agent_util.h" #include "webkit/fileapi/external_mount_points.h" -#include "webkit/user_agent/user_agent_util.h" using content::BrowserContext; using content::BrowserThread; diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc index 2c2f27f..4000083 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc @@ -72,8 +72,8 @@ #include "content/public/common/url_constants.h" #include "content/public/common/url_utils.h" #include "net/base/escape.h" +#include "webkit/common/user_agent/user_agent_util.h" #include "webkit/glue/glue_serialize.h" -#include "webkit/user_agent/user_agent_util.h" #if defined(OS_MACOSX) #include "ui/base/cocoa/find_pasteboard.h" diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc index 068ed64..6bf4fb7 100644 --- a/chrome/browser/ui/webui/help/help_handler.cc +++ b/chrome/browser/ui/webui/help/help_handler.cc @@ -35,8 +35,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "v8/include/v8.h" +#include "webkit/common/user_agent/user_agent_util.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/user_agent/user_agent_util.h" #if defined(OS_CHROMEOS) #include "base/files/file_util_proxy.h" diff --git a/chrome/browser/ui/webui/version_ui.cc b/chrome/browser/ui/webui/version_ui.cc index 7acebc8..81fc2cc 100644 --- a/chrome/browser/ui/webui/version_ui.cc +++ b/chrome/browser/ui/webui/version_ui.cc @@ -19,7 +19,7 @@ #include "grit/generated_resources.h" #include "grit/google_chrome_strings.h" #include "v8/include/v8.h" -#include "webkit/user_agent/user_agent_util.h" +#include "webkit/common/user_agent/user_agent_util.h" #if defined(ENABLE_THEMES) #include "chrome/browser/ui/webui/theme_source.h" diff --git a/chrome/common/DEPS b/chrome/common/DEPS index 395eb6e..5eb4b94 100644 --- a/chrome/common/DEPS +++ b/chrome/common/DEPS @@ -16,9 +16,9 @@ include_rules = [ "+remoting/client/plugin", "+sandbox/win/src", "+skia", + "+webkit/common/user_agent", "+webkit/glue", "+webkit/plugins", - "+webkit/user_agent", # TODO(jam): remove me once chrome_notifcation_types.h moves to browser "+content/public/browser/notification_types.h", diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc index e330037..555be67 100644 --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc @@ -33,10 +33,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" +#include "webkit/common/user_agent/user_agent_util.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/plugin_constants.h" #include "webkit/plugins/plugin_switches.h" -#include "webkit/user_agent/user_agent_util.h" #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. diff --git a/chrome/common/chrome_content_client_ios.mm b/chrome/common/chrome_content_client_ios.mm index cc1f008..3c4b66e 100644 --- a/chrome/common/chrome_content_client_ios.mm +++ b/chrome/common/chrome_content_client_ios.mm @@ -11,7 +11,7 @@ #include "googleurl/src/gurl.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "webkit/user_agent/user_agent_util.h" +#include "webkit/common/user_agent/user_agent_util.h" // TODO(ios): Investigate merging with chrome_content_client.cc; this would // requiring either a lot of ifdefing, or spliting the file into parts. diff --git a/chrome_frame/html_utils.cc b/chrome_frame/html_utils.cc index ef49b06..3f816b9 100644 --- a/chrome_frame/html_utils.cc +++ b/chrome_frame/html_utils.cc @@ -13,7 +13,7 @@ #include "chrome/common/chrome_version_info.h" #include "chrome_frame/utils.h" #include "net/base/net_util.h" -#include "webkit/user_agent/user_agent_util.h" +#include "webkit/common/user_agent/user_agent_util.h" const wchar_t kQuotes[] = L"\"'"; const char kXFrameOptionsHeader[] = "X-Frame-Options"; diff --git a/chrome_frame/test/html_util_unittests.cc b/chrome_frame/test/html_util_unittests.cc index 66b0546..ca330d4 100644 --- a/chrome_frame/test/html_util_unittests.cc +++ b/chrome_frame/test/html_util_unittests.cc @@ -24,7 +24,7 @@ #include "chrome_frame/chrome_frame_delegate.h" #include "chrome_frame/html_utils.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/user_agent/user_agent_util.h" +#include "webkit/common/user_agent/user_agent_util.h" const char kChromeFrameUserAgent[] = "chromeframe"; diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index 54ceddd..8c6bd29 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -42,7 +42,7 @@ #include "ui/base/ui_base_paths.h" #include "ui/base/ui_base_switches.h" #include "ui/base/win/dpi.h" -#include "webkit/user_agent/user_agent.h" +#include "webkit/common/user_agent/user_agent.h" #if defined(USE_TCMALLOC) #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h" diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc index cf08802..910059f 100644 --- a/content/browser/android/content_view_core_impl.cc +++ b/content/browser/android/content_view_core_impl.cc @@ -52,8 +52,8 @@ #include "ui/gfx/screen.h" #include "ui/gfx/size_conversions.h" #include "ui/gfx/size_f.h" +#include "webkit/common/user_agent/user_agent_util.h" #include "webkit/glue/webmenuitem.h" -#include "webkit/user_agent/user_agent_util.h" using base::android::AttachCurrentThread; using base::android::ConvertJavaStringToUTF16; diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc index 4e9bb66..bcbfce0 100644 --- a/content/browser/devtools/devtools_http_handler_impl.cc +++ b/content/browser/devtools/devtools_http_handler_impl.cc @@ -47,8 +47,8 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" #include "ui/base/layout.h" -#include "webkit/user_agent/user_agent.h" -#include "webkit/user_agent/user_agent_util.h" +#include "webkit/common/user_agent/user_agent.h" +#include "webkit/common/user_agent/user_agent_util.h" namespace content { diff --git a/content/content_tests.gypi b/content/content_tests.gypi index cfe609d..3aa2294 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -540,7 +540,7 @@ '../webkit/quota/quota_manager_unittest.cc', '../webkit/quota/quota_temporary_storage_evictor_unittest.cc', '../webkit/quota/usage_tracker_unittest.cc', - '../webkit/user_agent/user_agent_unittest.cc', + '../webkit/common/user_agent/user_agent_unittest.cc', ], 'conditions': [ ['OS == "ios"', { diff --git a/content/public/common/content_client.cc b/content/public/common/content_client.cc index 96cf48c..dec20ca 100644 --- a/content/public/common/content_client.cc +++ b/content/public/common/content_client.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/strings/string_piece.h" #include "ui/gfx/image/image.h" -#include "webkit/user_agent/user_agent.h" +#include "webkit/common/user_agent/user_agent.h" #if defined(ENABLE_PLUGINS) #include "webkit/plugins/ppapi/host_globals.h" diff --git a/content/renderer/pepper/pepper_url_request_unittest.cc b/content/renderer/pepper/pepper_url_request_unittest.cc index 22be7c7..8109261 100644 --- a/content/renderer/pepper/pepper_url_request_unittest.cc +++ b/content/renderer/pepper/pepper_url_request_unittest.cc @@ -14,9 +14,9 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "webkit/common/user_agent/user_agent.h" +#include "webkit/common/user_agent/user_agent_util.h" #include "webkit/plugins/ppapi/url_request_info_util.h" -#include "webkit/user_agent/user_agent.h" -#include "webkit/user_agent/user_agent_util.h" // This test is a end-to-end test from the resource to the WebKit request // object. The actual resource implementation is so simple, it makes sense to diff --git a/content/shell/common/shell_content_client.cc b/content/shell/common/shell_content_client.cc index 6b9a9bf..0981584 100644 --- a/content/shell/common/shell_content_client.cc +++ b/content/shell/common/shell_content_client.cc @@ -14,7 +14,7 @@ #include "grit/webkit_strings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "webkit/user_agent/user_agent_util.h" +#include "webkit/common/user_agent/user_agent_util.h" namespace content { diff --git a/webkit/user_agent/user_agent.cc b/webkit/common/user_agent/user_agent.cc index dea8df0..f6c2171 100644 --- a/webkit/user_agent/user_agent.cc +++ b/webkit/common/user_agent/user_agent.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/user_agent/user_agent.h" +#include "webkit/common/user_agent/user_agent.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/synchronization/lock.h" -#include "webkit/user_agent/user_agent_util.h" +#include "webkit/common/user_agent/user_agent_util.h" namespace webkit_glue { diff --git a/webkit/user_agent/user_agent.h b/webkit/common/user_agent/user_agent.h index 833882f..c0364fd 100644 --- a/webkit/user_agent/user_agent.h +++ b/webkit/common/user_agent/user_agent.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_USER_AGENT_USER_AGENT_H_ -#define WEBKIT_USER_AGENT_USER_AGENT_H_ +#ifndef WEBKIT_COMMON_USER_AGENT_USER_AGENT_H_ +#define WEBKIT_COMMON_USER_AGENT_USER_AGENT_H_ #include <string> #include "base/basictypes.h" #include "googleurl/src/gurl.h" -#include "webkit/user_agent/webkit_user_agent_export.h" +#include "webkit/common/user_agent/webkit_user_agent_export.h" namespace webkit_glue { @@ -26,4 +26,4 @@ WEBKIT_USER_AGENT_EXPORT const std::string& GetUserAgent(const GURL& url); } // namespace webkit_glue -#endif // WEBKIT_USER_AGENT_USER_AGENT_H_ +#endif // WEBKIT_COMMON_USER_AGENT_USER_AGENT_H_ diff --git a/webkit/user_agent/user_agent_unittest.cc b/webkit/common/user_agent/user_agent_unittest.cc index 1f1ee3a..8db0b88 100644 --- a/webkit/user_agent/user_agent_unittest.cc +++ b/webkit/common/user_agent/user_agent_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 "webkit/user_agent/user_agent.h" +#include "webkit/common/user_agent/user_agent.h" #include <string> diff --git a/webkit/user_agent/user_agent_util.cc b/webkit/common/user_agent/user_agent_util.cc index 18390b1..98615ea 100644 --- a/webkit/user_agent/user_agent_util.cc +++ b/webkit/common/user_agent/user_agent_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 "webkit/user_agent/user_agent_util.h" +#include "webkit/common/user_agent/user_agent_util.h" #if defined(OS_POSIX) && !defined(OS_MACOSX) #include <sys/utsname.h> diff --git a/webkit/user_agent/user_agent_util.h b/webkit/common/user_agent/user_agent_util.h index dc28130..3fbdf54 100644 --- a/webkit/user_agent/user_agent_util.h +++ b/webkit/common/user_agent/user_agent_util.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_USER_AGENT_USER_AGENT_UTIL_H_ -#define WEBKIT_USER_AGENT_USER_AGENT_UTIL_H_ +#ifndef WEBKIT_COMMON_USER_AGENT_USER_AGENT_UTIL_H_ +#define WEBKIT_COMMON_USER_AGENT_USER_AGENT_UTIL_H_ #include <string> #include "base/basictypes.h" -#include "webkit/user_agent/webkit_user_agent_export.h" +#include "webkit/common/user_agent/webkit_user_agent_export.h" namespace webkit_glue { @@ -35,4 +35,4 @@ WEBKIT_USER_AGENT_EXPORT std::string BuildUserAgentFromOSAndProduct( } // namespace webkit_glue -#endif // WEBKIT_USER_AGENT_USER_AGENT_UTIL_H_ +#endif // WEBKIT_COMMON_USER_AGENT_USER_AGENT_UTIL_H_ diff --git a/webkit/user_agent/user_agent_util_ios.mm b/webkit/common/user_agent/user_agent_util_ios.mm index 99a2d24..080301f 100644 --- a/webkit/user_agent/user_agent_util_ios.mm +++ b/webkit/common/user_agent/user_agent_util_ios.mm @@ -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 "webkit/user_agent/user_agent_util.h" +#include "webkit/common/user_agent/user_agent_util.h" #import <UIKit/UIKit.h> diff --git a/webkit/user_agent/webkit_user_agent.gypi b/webkit/common/user_agent/webkit_user_agent.gypi index d7324cb..61e88ea 100644 --- a/webkit/user_agent/webkit_user_agent.gypi +++ b/webkit/common/user_agent/webkit_user_agent.gypi @@ -50,7 +50,7 @@ 'action_name': 'webkit_version', 'inputs': [ '<(script)', - '../../build/util/lastchange.py', # Used by the script. + '../../../build/util/lastchange.py', # Used by the script. # This depends on the svn revision of third_party/WebKit but does # not list it as a dependency. Incremental builds will have # the wrong WEBKIT_SVN_REVISION. @@ -58,7 +58,7 @@ 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/webkit_version.h', ], - 'action': ['python', '<(script)', '../../third_party/WebKit/Source', + 'action': ['python', '<(script)', '../../../third_party/WebKit/Source', '<(SHARED_INTERMEDIATE_DIR)'], 'variables': { 'script': '../build/webkit_version.py', diff --git a/webkit/user_agent/webkit_user_agent_export.h b/webkit/common/user_agent/webkit_user_agent_export.h index d72c9f3..5f9598f 100644 --- a/webkit/user_agent/webkit_user_agent_export.h +++ b/webkit/common/user_agent/webkit_user_agent_export.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 WEBKIT_USER_AGENT_WEBKIT_USER_AGENT_EXPORT_H_ -#define WEBKIT_USER_AGENT_WEBKIT_USER_AGENT_EXPORT_H_ +#ifndef WEBKIT_COMMON_USER_AGENT_WEBKIT_USER_AGENT_EXPORT_H_ +#define WEBKIT_COMMON_USER_AGENT_WEBKIT_USER_AGENT_EXPORT_H_ #if defined(COMPONENT_BUILD) #if defined(WIN32) @@ -26,4 +26,4 @@ #define WEBKIT_USER_AGENT_EXPORT #endif -#endif // WEBKIT_USER_AGENT_WEBKIT_USER_AGENT_EXPORT_H_ +#endif // WEBKIT_COMMON_USER_AGENT_WEBKIT_USER_AGENT_EXPORT_H_ diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc index af0ec80..d22ec28 100644 --- a/webkit/glue/webkitplatformsupport_impl.cc +++ b/webkit/glue/webkitplatformsupport_impl.cc @@ -42,6 +42,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" #include "ui/base/layout.h" #include "webkit/base/file_path_string_conversions.h" +#include "webkit/common/user_agent/user_agent.h" #include "webkit/glue/fling_curve_configuration.h" #include "webkit/glue/touch_fling_gesture_curve.h" #include "webkit/glue/web_discardable_memory_impl.h" @@ -53,7 +54,6 @@ #include "webkit/media/audio_decoder.h" #include "webkit/plugins/npapi/plugin_instance.h" #include "webkit/plugins/webplugininfo.h" -#include "webkit/user_agent/user_agent.h" #if defined(OS_ANDROID) #include "webkit/glue/fling_animator_impl_android.h" diff --git a/webkit/plugins/npapi/plugin_host.cc b/webkit/plugins/npapi/plugin_host.cc index 3bb648d..d68988b 100644 --- a/webkit/plugins/npapi/plugin_host.cc +++ b/webkit/plugins/npapi/plugin_host.cc @@ -20,13 +20,13 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_implementation.h" #include "ui/gl/gl_surface.h" +#include "webkit/common/user_agent/user_agent.h" #include "webkit/plugins/npapi/plugin_instance.h" #include "webkit/plugins/npapi/plugin_lib.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/npapi/plugin_stream_url.h" #include "webkit/plugins/npapi/webplugin_delegate.h" #include "webkit/plugins/webplugininfo.h" -#include "webkit/user_agent/user_agent.h" #if defined(OS_MACOSX) #include "base/mac/mac_util.h" diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index f344933c..0930902 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -52,6 +52,8 @@ #include "ui/gl/gl_surface.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/base/file_path_string_conversions.h" +#include "webkit/common/user_agent/user_agent.h" +#include "webkit/common/user_agent/user_agent_util.h" #include "webkit/fileapi/isolated_context.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkitplatformsupport_impl.h" @@ -78,8 +80,6 @@ #include "webkit/tools/test_shell/simple_dom_storage_system.h" #include "webkit/tools/test_shell/simple_file_system.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" -#include "webkit/user_agent/user_agent.h" -#include "webkit/user_agent/user_agent_util.h" #if defined(OS_ANDROID) #include "base/test/test_support_android.h" diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp index 4eed048..4519488 100644 --- a/webkit/support/webkit_support.gyp +++ b/webkit/support/webkit_support.gyp @@ -4,7 +4,7 @@ { 'includes': [ - '../user_agent/webkit_user_agent.gypi', + '../common/user_agent/webkit_user_agent.gypi', ], 'conditions': [ # TODO(stuartmorgan): All dependencies from code built on iOS to diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index 3e06ea5..ee093b2 100644 --- a/webkit/tools/test_shell/test_shell_request_context.cc +++ b/webkit/tools/test_shell/test_shell_request_context.cc @@ -32,10 +32,10 @@ #include "webkit/blob/blob_storage_controller.h" #include "webkit/blob/blob_url_request_job_factory.h" #include "webkit/browser/fileapi/file_system_url_request_job_factory.h" +#include "webkit/common/user_agent/user_agent.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/tools/test_shell/simple_file_system.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" -#include "webkit/user_agent/user_agent.h" class TestShellHttpUserAgentSettings : public net::HttpUserAgentSettings { public: |