summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/clipboard/clipboard_mac.mm2
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_mac.mm1
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm1
-rw-r--r--chrome/browser/cocoa/import_progress_dialog.mm2
-rw-r--r--chrome/browser/cocoa/web_drag_source.mm1
-rw-r--r--chrome/browser/geolocation/wifi_data_provider_corewlan_mac.mm1
-rw-r--r--chrome/browser/login_prompt_mac.mm2
-rw-r--r--chrome/browser/password_manager/encryptor_mac.mm2
-rw-r--r--chrome/browser/password_manager/password_store_mac.cc1
-rw-r--r--chrome/browser/password_manager/password_store_mac_unittest.cc1
-rw-r--r--chrome/common/logging_chrome.cc2
-rw-r--r--chrome/common/sandbox_mac_unittest.mm2
-rw-r--r--webkit/glue/plugins/plugin_lib_mac.mm1
-rw-r--r--webkit/glue/plugins/plugin_list_mac.mm2
-rw-r--r--webkit/tools/test_shell/mac/test_webview_delegate.mm2
-rw-r--r--webkit/tools/test_shell/test_shell_mac.mm2
16 files changed, 17 insertions, 8 deletions
diff --git a/app/clipboard/clipboard_mac.mm b/app/clipboard/clipboard_mac.mm
index f546f84..94de2b9 100644
--- a/app/clipboard/clipboard_mac.mm
+++ b/app/clipboard/clipboard_mac.mm
@@ -12,8 +12,8 @@
#include "base/mac_util.h"
#include "base/scoped_cftyperef.h"
#include "base/scoped_nsobject.h"
-#include "base/string_util.h"
#include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
namespace {
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index 1da63ec..1ebc1f7 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -11,6 +11,7 @@
#include "app/resource_bundle.h"
#include "base/string_util.h"
#include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autocomplete/autocomplete_edit.h"
#include "chrome/browser/autocomplete/autocomplete_popup_model.h"
#include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm
index 59ce3bc..6b28844 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm
@@ -9,6 +9,7 @@
#include "base/gfx/size.h"
#include "base/string_util.h"
#include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autocomplete/autocomplete.h"
#include "testing/platform_test.h"
diff --git a/chrome/browser/cocoa/import_progress_dialog.mm b/chrome/browser/cocoa/import_progress_dialog.mm
index c07ef3a..65d91e3 100644
--- a/chrome/browser/cocoa/import_progress_dialog.mm
+++ b/chrome/browser/cocoa/import_progress_dialog.mm
@@ -9,8 +9,8 @@
#include "base/mac_util.h"
#include "base/message_loop.h"
#import "base/scoped_nsobject.h"
-#include "base/string_util.h"
#import "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/cocoa/web_drag_source.mm b/chrome/browser/cocoa/web_drag_source.mm
index bbeed5b..174df6c 100644
--- a/chrome/browser/cocoa/web_drag_source.mm
+++ b/chrome/browser/cocoa/web_drag_source.mm
@@ -10,6 +10,7 @@
#include "base/sys_string_conversions.h"
#include "base/task.h"
#include "base/thread.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/download/download_manager.h"
#include "chrome/browser/download/drag_download_file.h"
diff --git a/chrome/browser/geolocation/wifi_data_provider_corewlan_mac.mm b/chrome/browser/geolocation/wifi_data_provider_corewlan_mac.mm
index da960fc..3f43281 100644
--- a/chrome/browser/geolocation/wifi_data_provider_corewlan_mac.mm
+++ b/chrome/browser/geolocation/wifi_data_provider_corewlan_mac.mm
@@ -10,6 +10,7 @@
#include "base/scoped_nsautorelease_pool.h"
#include "base/scoped_nsobject.h"
+#include "base/utf_string_conversions.h"
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
// If building on 10.6 we can include the framework header directly.
diff --git a/chrome/browser/login_prompt_mac.mm b/chrome/browser/login_prompt_mac.mm
index 7446aa2..fec312b 100644
--- a/chrome/browser/login_prompt_mac.mm
+++ b/chrome/browser/login_prompt_mac.mm
@@ -7,7 +7,9 @@
#include "app/l10n_util.h"
#include "base/mac_util.h"
+#include "base/string_util.h"
#include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/cocoa/constrained_window_mac.h"
#include "chrome/browser/login_model.h"
diff --git a/chrome/browser/password_manager/encryptor_mac.mm b/chrome/browser/password_manager/encryptor_mac.mm
index 435f08d..ca133e2 100644
--- a/chrome/browser/password_manager/encryptor_mac.mm
+++ b/chrome/browser/password_manager/encryptor_mac.mm
@@ -5,7 +5,7 @@
#include "chrome/browser/password_manager/encryptor.h"
#include "base/logging.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
bool Encryptor::EncryptString16(const string16& plaintext,
std::string* ciphertext) {
diff --git a/chrome/browser/password_manager/password_store_mac.cc b/chrome/browser/password_manager/password_store_mac.cc
index 3f5ea0b..dd12593 100644
--- a/chrome/browser/password_manager/password_store_mac.cc
+++ b/chrome/browser/password_manager/password_store_mac.cc
@@ -13,6 +13,7 @@
#include "base/mac_util.h"
#include "base/stl_util-inl.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/keychain_mac.h"
#include "chrome/browser/password_manager/login_database_mac.h"
diff --git a/chrome/browser/password_manager/password_store_mac_unittest.cc b/chrome/browser/password_manager/password_store_mac_unittest.cc
index 8591b86..7fefc31 100644
--- a/chrome/browser/password_manager/password_store_mac_unittest.cc
+++ b/chrome/browser/password_manager/password_store_mac_unittest.cc
@@ -7,6 +7,7 @@
#include "base/basictypes.h"
#include "base/stl_util-inl.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/keychain_mock_mac.h"
#include "chrome/browser/password_manager/password_store_mac.h"
#include "chrome/browser/password_manager/password_store_mac_internal.h"
diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc
index c957782..2747447 100644
--- a/chrome/common/logging_chrome.cc
+++ b/chrome/common/logging_chrome.cc
@@ -38,8 +38,8 @@
#include "base/file_util.h"
#include "base/logging.h"
#include "base/path_service.h"
-#include "base/string_util.h"
#include "base/sys_info.h"
+#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/env_vars.h"
diff --git a/chrome/common/sandbox_mac_unittest.mm b/chrome/common/sandbox_mac_unittest.mm
index 6f469f1..0adcc6d 100644
--- a/chrome/common/sandbox_mac_unittest.mm
+++ b/chrome/common/sandbox_mac_unittest.mm
@@ -12,8 +12,8 @@ extern "C" {
#include "base/file_util.h"
#include "base/file_path.h"
#include "base/multiprocess_test.h"
-#include "base/string_util.h"
#include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
#include "chrome/common/sandbox_mac.h"
#include "testing/gtest/include/gtest/gtest.h"
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"
generated by cgit v1.1 at 2025-01-25 18:01:03 +0000