diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit/chromium/src/LocalizedStrings.cpp | |
parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit/chromium/src/LocalizedStrings.cpp')
-rw-r--r-- | Source/WebKit/chromium/src/LocalizedStrings.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/WebKit/chromium/src/LocalizedStrings.cpp b/Source/WebKit/chromium/src/LocalizedStrings.cpp index 081a67b8a..2a4432d8a 100644 --- a/Source/WebKit/chromium/src/LocalizedStrings.cpp +++ b/Source/WebKit/chromium/src/LocalizedStrings.cpp @@ -34,11 +34,9 @@ #include "IntSize.h" #include "NotImplemented.h" -#include "WebKit.h" -#include "platform/WebKitPlatformSupport.h" -#include "platform/WebString.h" - +#include <public/Platform.h> #include <public/WebLocalizedString.h> +#include <public/WebString.h> #include <wtf/text/StringBuilder.h> #include <wtf/text/WTFString.h> @@ -215,6 +213,12 @@ String crashedPluginText() return String("Plug-in Failure"); } +String blockedPluginByContentSecurityPolicyText() +{ + notImplemented(); + return String(); +} + String insecurePluginVersionText() { notImplemented(); |