diff options
author | vitalyr@chromium.org <vitalyr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-15 14:26:56 +0000 |
---|---|---|
committer | vitalyr@chromium.org <vitalyr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-15 14:26:56 +0000 |
commit | fff471d7d1ea75d33096196d09aa194b7fb7ca02 (patch) | |
tree | f88877e264685ff41a360514f39cd3612ec0e4b5 | |
parent | d8b50bece6058f921006bc734bd045fa55ff49be (diff) | |
download | chromium_src-fff471d7d1ea75d33096196d09aa194b7fb7ca02.zip chromium_src-fff471d7d1ea75d33096196d09aa194b7fb7ca02.tar.gz chromium_src-fff471d7d1ea75d33096196d09aa194b7fb7ca02.tar.bz2 |
WebKit roll 88829:88857.
Also add missing WebString include to cros_mount_point_provider.cc.
Review URL: http://codereview.chromium.org/7170017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89183 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | DEPS | 2 | ||||
-rw-r--r-- | webkit/chromeos/fileapi/cros_mount_point_provider.cc | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -4,7 +4,7 @@ vars = { "googlecode_url": "http://%s.googlecode.com/svn", "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk", - "webkit_revision": "88829", + "webkit_revision": "88857", "chromium_git": "http://git.chromium.org/git", "swig_revision": "69281", # These hashes need to be updated when nacl_revision is changed. diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.cc b/webkit/chromeos/fileapi/cros_mount_point_provider.cc index 74df6d8..930d00e 100644 --- a/webkit/chromeos/fileapi/cros_mount_point_provider.cc +++ b/webkit/chromeos/fileapi/cros_mount_point_provider.cc @@ -12,6 +12,7 @@ #include "base/stringprintf.h" #include "base/synchronization/lock.h" #include "base/utf_string_conversions.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.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" @@ -188,4 +189,3 @@ bool CrosMountPointProvider::GetVirtualPath(const FilePath& filesystem_path, } } // namespace chromeos - |