summaryrefslogtreecommitdiffstats
path: root/WebKit/android/plugins/ANPSystemInterface.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/plugins/ANPSystemInterface.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/plugins/ANPSystemInterface.cpp')
-rw-r--r--WebKit/android/plugins/ANPSystemInterface.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/WebKit/android/plugins/ANPSystemInterface.cpp b/WebKit/android/plugins/ANPSystemInterface.cpp
index 42ec9e4..34fe162 100644
--- a/WebKit/android/plugins/ANPSystemInterface.cpp
+++ b/WebKit/android/plugins/ANPSystemInterface.cpp
@@ -26,7 +26,7 @@
// must include config.h first for webkit to fiddle with new/delete
#include "config.h"
-#include "CString.h"
+#include "ANPSystem_npapi.h"
#include "JavaSharedClient.h"
#include "PluginClient.h"
#include "PluginPackage.h"
@@ -34,8 +34,7 @@
#include "PluginWidgetAndroid.h"
#include "SkString.h"
#include "WebViewCore.h"
-
-#include "ANPSystem_npapi.h"
+#include <wtf/text/CString.h>
static const char* gApplicationDataDir = NULL;