summaryrefslogtreecommitdiffstats
path: root/webkit/fileapi
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-17 06:50:01 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-17 06:50:01 +0000
commitc1d9cdcb2aa753686fb29f3c5f42f710acf49782 (patch)
tree9230c8ca02e0607cec3bfeb4ed1c945e4163bc84 /webkit/fileapi
parent8bd0fe6f88b7f6f1cc8c7b7c4c2474669d8d6d60 (diff)
downloadchromium_src-c1d9cdcb2aa753686fb29f3c5f42f710acf49782.zip
chromium_src-c1d9cdcb2aa753686fb29f3c5f42f710acf49782.tar.gz
chromium_src-c1d9cdcb2aa753686fb29f3c5f42f710acf49782.tar.bz2
Roll WebKit DEPS past WebKit move. Update gyp files and include paths to reflect the move. Consolidate how we DEPS in WebKit source files. Cross fingers.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71586 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi')
-rw-r--r--webkit/fileapi/file_system_callback_dispatcher.h2
-rw-r--r--webkit/fileapi/file_system_path_manager.cc6
-rw-r--r--webkit/fileapi/webfilewriter_base.cc6
-rw-r--r--webkit/fileapi/webfilewriter_base.h2
-rw-r--r--webkit/fileapi/webfilewriter_base_unittest.cc6
5 files changed, 11 insertions, 11 deletions
diff --git a/webkit/fileapi/file_system_callback_dispatcher.h b/webkit/fileapi/file_system_callback_dispatcher.h
index 0b4c25b..e5265bd 100644
--- a/webkit/fileapi/file_system_callback_dispatcher.h
+++ b/webkit/fileapi/file_system_callback_dispatcher.h
@@ -12,7 +12,7 @@
namespace fileapi {
// This class mirrors the callbacks in
-// third_party/WebKit/WebKit/chromium/public/WebFileSystemCallbacks.h,
+// third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h,
// but uses chromium types.
class FileSystemCallbackDispatcher {
public:
diff --git a/webkit/fileapi/file_system_path_manager.cc b/webkit/fileapi/file_system_path_manager.cc
index 2bd1f9e..72c5355 100644
--- a/webkit/fileapi/file_system_path_manager.cc
+++ b/webkit/fileapi/file_system_path_manager.cc
@@ -14,9 +14,9 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "googleurl/src/gurl.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebFileSystem.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystem.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
#include "webkit/glue/webkit_glue.h"
// We use some of WebKit types for conversions between storage identifiers
diff --git a/webkit/fileapi/webfilewriter_base.cc b/webkit/fileapi/webfilewriter_base.cc
index 9d3939f..cf2a7bc 100644
--- a/webkit/fileapi/webfilewriter_base.cc
+++ b/webkit/fileapi/webfilewriter_base.cc
@@ -5,9 +5,9 @@
#include "webkit/fileapi/webfilewriter_base.h"
#include "base/logging.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebFileError.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebFileWriterClient.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileWriterClient.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
#include "webkit/glue/webkit_glue.h"
namespace fileapi {
diff --git a/webkit/fileapi/webfilewriter_base.h b/webkit/fileapi/webfilewriter_base.h
index 790e48b..f47b383 100644
--- a/webkit/fileapi/webfilewriter_base.h
+++ b/webkit/fileapi/webfilewriter_base.h
@@ -7,7 +7,7 @@
#include "base/file_path.h"
#include "base/platform_file.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebFileWriter.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileWriter.h"
class GURL;
diff --git a/webkit/fileapi/webfilewriter_base_unittest.cc b/webkit/fileapi/webfilewriter_base_unittest.cc
index 3500d66..9f8fe49 100644
--- a/webkit/fileapi/webfilewriter_base_unittest.cc
+++ b/webkit/fileapi/webfilewriter_base_unittest.cc
@@ -10,9 +10,9 @@
#include "base/utf_string_conversions.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebFileError.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebFileWriterClient.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileWriterClient.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
namespace fileapi {