summaryrefslogtreecommitdiffstats
path: root/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-04-28 15:26:38 +0100
committerSteve Block <steveblock@google.com>2010-05-11 14:42:13 +0100
commit79768700a853c40c66ff0b0591957958667fdd9e (patch)
tree88e6c8a86f3a4ccb554f55313f496eb3170ffdc9 /WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
parent98be84cc0473aaefc551ded18abd6c40bd108a8c (diff)
downloadexternal_webkit-79768700a853c40c66ff0b0591957958667fdd9e.zip
external_webkit-79768700a853c40c66ff0b0591957958667fdd9e.tar.gz
external_webkit-79768700a853c40c66ff0b0591957958667fdd9e.tar.bz2
Merge webkit.org at r58033 : Update location of CString.h
See http://trac.webkit.org/changeset/56825 Change-Id: I8ba6a9685dcd1d8c4dec3400fba81e19fcbfe74d
Diffstat (limited to 'WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp')
-rw-r--r--WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index bd2c69a..cf4691b 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -29,7 +29,6 @@
#include "FrameLoaderClientAndroid.h"
#include "BackForwardList.h"
-#include "CString.h"
#include "CachedFrame.h"
#include "CachedFramePlatformDataAndroid.h"
#include "Chrome.h"
@@ -77,6 +76,7 @@
#include "android_graphics.h"
#include <utils/AssetManager.h>
+#include <wtf/text/CString.h>
extern android::AssetManager* globalAssetManager();