summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorjhawkins@google.com <jhawkins@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-11 18:25:45 +0000
committerjhawkins@google.com <jhawkins@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-11 18:25:45 +0000
commitd55194ca076df03e149b904b12f83baadad85a8e (patch)
tree5732658491a778651e02fcc17beb8655a1a7edf1 /app
parent5bc8fe91607f20f2d43dc461ca188dd07b55d435 (diff)
downloadchromium_src-d55194ca076df03e149b904b12f83baadad85a8e.zip
chromium_src-d55194ca076df03e149b904b12f83baadad85a8e.tar.gz
chromium_src-d55194ca076df03e149b904b12f83baadad85a8e.tar.bz2
win: string_util.h -> utf_string_conversions.h fix.
BUG=none TEST=none Review URL: http://codereview.chromium.org/830002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/clipboard/clipboard_util_win.cc1
-rw-r--r--app/clipboard/clipboard_win.cc1
-rw-r--r--app/l10n_util_dummy.cc2
-rw-r--r--app/os_exchange_data_provider_win.cc2
-rw-r--r--app/os_exchange_data_win_unittest.cc2
-rw-r--r--app/sql/connection.cc1
6 files changed, 6 insertions, 3 deletions
diff --git a/app/clipboard/clipboard_util_win.cc b/app/clipboard/clipboard_util_win.cc
index 37b78f7..355e8d9 100644
--- a/app/clipboard/clipboard_util_win.cc
+++ b/app/clipboard/clipboard_util_win.cc
@@ -12,6 +12,7 @@
#include "base/logging.h"
#include "base/scoped_handle.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
namespace {
diff --git a/app/clipboard/clipboard_win.cc b/app/clipboard/clipboard_win.cc
index 5e3bc42..b729a52 100644
--- a/app/clipboard/clipboard_win.cc
+++ b/app/clipboard/clipboard_win.cc
@@ -18,6 +18,7 @@
#include "base/message_loop.h"
#include "base/shared_memory.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
namespace {
diff --git a/app/l10n_util_dummy.cc b/app/l10n_util_dummy.cc
index 749ecb4..a9a4a92 100644
--- a/app/l10n_util_dummy.cc
+++ b/app/l10n_util_dummy.cc
@@ -8,8 +8,8 @@
#include "base/command_line.h"
#include "base/string16.h"
#include "base/string_piece.h"
-#include "base/string_util.h"
#include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
#include "build/build_config.h"
#include "unicode/uscript.h"
diff --git a/app/os_exchange_data_provider_win.cc b/app/os_exchange_data_provider_win.cc
index 8f953d1..578f1fd 100644
--- a/app/os_exchange_data_provider_win.cc
+++ b/app/os_exchange_data_provider_win.cc
@@ -12,7 +12,7 @@
#include "base/pickle.h"
#include "base/scoped_handle.h"
#include "base/stl_util-inl.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "googleurl/src/gurl.h"
#include "grit/app_strings.h"
#include "net/base/net_util.h"
diff --git a/app/os_exchange_data_win_unittest.cc b/app/os_exchange_data_win_unittest.cc
index f4ec8fb..cebf641 100644
--- a/app/os_exchange_data_win_unittest.cc
+++ b/app/os_exchange_data_win_unittest.cc
@@ -9,7 +9,7 @@
#include "base/ref_counted.h"
#include "base/scoped_handle.h"
#include "base/scoped_ptr.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/app/sql/connection.cc b/app/sql/connection.cc
index 8f74e6e..81f3d36 100644
--- a/app/sql/connection.cc
+++ b/app/sql/connection.cc
@@ -10,6 +10,7 @@
#include "base/file_path.h"
#include "base/logging.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "third_party/sqlite/preprocessed/sqlite3.h"
namespace sql {