diff options
Diffstat (limited to 'chrome/browser')
8 files changed, 12 insertions, 7 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index c663fb9..2a0e8a7 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -57,6 +57,11 @@ include_rules = [ "+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 + "+webkit/browser", + # webkit/glue files are listed individually since they aren't conceptually # grouped like the other webkit/ files, and can therefore be tackled one at # a time. diff --git a/chrome/browser/chromeos/drive/file_system_util_unittest.cc b/chrome/browser/chromeos/drive/file_system_util_unittest.cc index 1b04dee..b51c48f 100644 --- a/chrome/browser/chromeos/drive/file_system_util_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system_util_unittest.cc @@ -10,9 +10,9 @@ #include "base/utf_string_conversions.h" #include "chrome/test/base/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/external_mount_points.h" #include "webkit/fileapi/file_system_context.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_task_runners.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/isolated_context.h" diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc index 4b466e2..ea2050c 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc @@ -51,8 +51,8 @@ #include "content/public/browser/storage_partition.h" #include "googleurl/src/gurl.h" #include "ui/shell_dialogs/select_file_dialog.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_context.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" using content::BrowserContext; using content::BrowserThread; diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc index 628dc77..bc4758c 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc @@ -13,8 +13,8 @@ #include "chromeos/disks/mock_disk_mount_manager.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/storage_partition.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_context.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" using ::testing::_; using ::testing::ReturnRef; diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc index 12ad3d3..5204c4c 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc @@ -54,8 +54,8 @@ #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/screen.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_context.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/file_system_util.h" diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 30f2deb..0a0e19b 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -115,8 +115,8 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/extensions/install_limiter.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_context.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" #endif using content::BrowserContext; diff --git a/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h b/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h index ce6ab95..91bde7d 100644 --- a/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h +++ b/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_MEDIA_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_ #include "base/memory/scoped_ptr.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" namespace fileapi { class AsyncFileUtilAdapter; diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc index bcfbd88..a6e60c8 100644 --- a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc @@ -15,9 +15,9 @@ #include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h" #include "chrome/browser/media_galleries/fileapi/native_media_file_util.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/external_mount_points.h" #include "webkit/fileapi/file_system_context.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation.h" #include "webkit/fileapi/file_system_task_runners.h" #include "webkit/fileapi/file_system_url.h" |