diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/plugin_lib_mac.mm | 1 | ||||
| -rw-r--r-- | webkit/glue/plugins/plugin_list_mac.mm | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/mac/test_webview_delegate.mm | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_mac.mm | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/webkit/glue/plugins/plugin_lib_mac.mm b/webkit/glue/plugins/plugin_lib_mac.mm index b8ae784..64d34c3 100644 --- a/webkit/glue/plugins/plugin_lib_mac.mm +++ b/webkit/glue/plugins/plugin_lib_mac.mm @@ -11,6 +11,7 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" +#include "base/utf_string_conversions.h" #include "webkit/glue/plugins/plugin_list.h" static const short kSTRTypeDefinitionResourceID = 128; diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm index fee65b5..7748f152 100644 --- a/webkit/glue/plugins/plugin_list_mac.mm +++ b/webkit/glue/plugins/plugin_list_mac.mm @@ -8,7 +8,7 @@ #include "base/file_util.h" #include "base/mac_util.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "webkit/glue/plugins/plugin_lib.h" namespace { diff --git a/webkit/tools/test_shell/mac/test_webview_delegate.mm b/webkit/tools/test_shell/mac/test_webview_delegate.mm index cb2a392..ee5cef1 100644 --- a/webkit/tools/test_shell/mac/test_webview_delegate.mm +++ b/webkit/tools/test_shell/mac/test_webview_delegate.mm @@ -5,8 +5,8 @@ #include "webkit/tools/test_shell/test_webview_delegate.h" #import <Cocoa/Cocoa.h> -#include "base/string_util.h" #include "base/sys_string_conversions.h" +#include "base/utf_string_conversions.h" #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/WebKit/chromium/public/WebPopupMenu.h" #include "third_party/WebKit/WebKit/chromium/public/WebView.h" diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm index 889f4b5..608f959 100644 --- a/webkit/tools/test_shell/test_shell_mac.mm +++ b/webkit/tools/test_shell/test_shell_mac.mm @@ -23,7 +23,7 @@ #include "base/stats_table.h" #include "base/string16.h" #include "base/string_piece.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "grit/webkit_resources.h" #include "net/base/mime_util.h" #include "skia/ext/bitmap_platform_device.h" |