summaryrefslogtreecommitdiffstats
path: root/chrome/common
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 /chrome/common
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 'chrome/common')
-rw-r--r--chrome/common/child_process_logging_win.cc1
-rw-r--r--chrome/common/extensions/extension_file_util_unittest.cc4
-rw-r--r--chrome/common/zip.cc2
3 files changed, 5 insertions, 2 deletions
diff --git a/chrome/common/child_process_logging_win.cc b/chrome/common/child_process_logging_win.cc
index 654b4fb..0dc0579 100644
--- a/chrome/common/child_process_logging_win.cc
+++ b/chrome/common/child_process_logging_win.cc
@@ -7,6 +7,7 @@
#include <windows.h>
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/app/breakpad_win.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/installer/util/google_update_settings.h"
diff --git a/chrome/common/extensions/extension_file_util_unittest.cc b/chrome/common/extensions/extension_file_util_unittest.cc
index 9856e42..278006c 100644
--- a/chrome/common/extensions/extension_file_util_unittest.cc
+++ b/chrome/common/extensions/extension_file_util_unittest.cc
@@ -5,9 +5,9 @@
#include "chrome/common/extensions/extension_file_util.h"
#include "base/file_util.h"
-#include "base/scoped_temp_dir.h"
-#include "base/string_util.h"
#include "base/path_service.h"
+#include "base/scoped_temp_dir.h"
+#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
diff --git a/chrome/common/zip.cc b/chrome/common/zip.cc
index 3d5e729..f1d89b5 100644
--- a/chrome/common/zip.cc
+++ b/chrome/common/zip.cc
@@ -5,7 +5,9 @@
#include "chrome/common/zip.h"
#include "base/file_util.h"
+#include "base/logging.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "net/base/file_stream.h"
#include "third_party/zlib/contrib/minizip/unzip.h"
#include "third_party/zlib/contrib/minizip/zip.h"