summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-03 14:35:22 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-03 14:35:22 +0000
commitbe1ce6a7b2fa7e9622e5b249abd5fab478b6ca05 (patch)
treef8979e84e75cefbc8dc28180a7a6b99f5a0e34ed /app
parente28976b97eba6f8b7e5b39dba4f684c3ba6b2a6c (diff)
downloadchromium_src-be1ce6a7b2fa7e9622e5b249abd5fab478b6ca05.zip
chromium_src-be1ce6a7b2fa7e9622e5b249abd5fab478b6ca05.tar.gz
chromium_src-be1ce6a7b2fa7e9622e5b249abd5fab478b6ca05.tar.bz2
Add #include utf_string_conversions.h to all files that use ASCIIToWide and
ASCIIToUTF16. I removed string_util includes from a few places where it obviously wasn't needed. In a separate pass, I'm going to remove ASCIITo* from string_util, then I'm going to do an even later pass to find the unnecessary string_util.h includes and remove them. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/3058027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54746 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/clipboard/clipboard_win.cc4
-rw-r--r--app/l10n_util.cc1
-rw-r--r--app/l10n_util_unittest.cc1
3 files changed, 4 insertions, 2 deletions
diff --git a/app/clipboard/clipboard_win.cc b/app/clipboard/clipboard_win.cc
index 393907d..1a4d1c8 100644
--- a/app/clipboard/clipboard_win.cc
+++ b/app/clipboard/clipboard_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -16,7 +16,7 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/shared_memory.h"
-#include "base/string_util.h" // Remove when ASCIIToWide is in utf_string_...
+#include "base/string_util.h"
#include "base/string_number_conversions.h"
#include "base/utf_string_conversions.h"
#include "gfx/size.h"
diff --git a/app/l10n_util.cc b/app/l10n_util.cc
index b3e550f..0837c02 100644
--- a/app/l10n_util.cc
+++ b/app/l10n_util.cc
@@ -18,6 +18,7 @@
#include "base/string16.h"
#include "base/string_number_conversions.h"
#include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
#include "build/build_config.h"
#include "gfx/canvas.h"
#include "unicode/rbbi.h"
diff --git a/app/l10n_util_unittest.cc b/app/l10n_util_unittest.cc
index 8d26b92..2341559 100644
--- a/app/l10n_util_unittest.cc
+++ b/app/l10n_util_unittest.cc
@@ -20,6 +20,7 @@
#include "base/path_service.h"
#include "base/stl_util-inl.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#if defined(OS_WIN)
#include "base/win_util.h"
#endif