summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 22:40:45 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 22:40:45 +0000
commit906265870c8a3cc44ebbcad14eaea84559a49aed (patch)
treefc025f2e228464be651f0ea502fb7415467e8278 /printing
parent3aef722b8c533efc87df683a454f0779f9b6cabb (diff)
downloadchromium_src-906265870c8a3cc44ebbcad14eaea84559a49aed.zip
chromium_src-906265870c8a3cc44ebbcad14eaea84559a49aed.tar.gz
chromium_src-906265870c8a3cc44ebbcad14eaea84559a49aed.tar.bz2
Use a direct include of utf_string_conversions.h in google_apis/, gpu/, ipc/, media/, ppapi/, printing/, remoting/, rlz/, skia/, sql/, sync/, third_party/, tools/, webkit/, win8/.
BUG=none TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/15995038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
-rw-r--r--printing/backend/print_backend_unittest.cc2
-rw-r--r--printing/backend/print_backend_win.cc2
-rw-r--r--printing/backend/win_helper.cc2
-rw-r--r--printing/print_settings_initializer.cc2
-rw-r--r--printing/print_settings_initializer_gtk.cc2
-rw-r--r--printing/printed_document.cc2
-rw-r--r--printing/printing_context_win.cc2
7 files changed, 7 insertions, 7 deletions
diff --git a/printing/backend/print_backend_unittest.cc b/printing/backend/print_backend_unittest.cc
index 5575035..356a346 100644
--- a/printing/backend/print_backend_unittest.cc
+++ b/printing/backend/print_backend_unittest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/strings/utf_string_conversions.h"
#include "printing/backend/print_backend.h"
-#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace printing {
diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc
index 14d87aa..521207b 100644
--- a/printing/backend/print_backend_win.cc
+++ b/printing/backend/print_backend_win.cc
@@ -9,7 +9,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/strings/string_piece.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_bstr.h"
#include "base/win/scoped_comptr.h"
#include "base/win/scoped_hglobal.h"
diff --git a/printing/backend/win_helper.cc b/printing/backend/win_helper.cc
index 5a59220..3832dff 100644
--- a/printing/backend/win_helper.cc
+++ b/printing/backend/win_helper.cc
@@ -10,7 +10,7 @@
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "printing/backend/print_backend.h"
#include "printing/backend/print_backend_consts.h"
#include "printing/backend/printing_info_win.h"
diff --git a/printing/print_settings_initializer.cc b/printing/print_settings_initializer.cc
index c49a556..ed5ba07 100644
--- a/printing/print_settings_initializer.cc
+++ b/printing/print_settings_initializer.cc
@@ -10,8 +10,8 @@
#include "base/i18n/time_formatting.h"
#include "base/string_number_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "googleurl/src/gurl.h"
#include "printing/print_job_constants.h"
diff --git a/printing/print_settings_initializer_gtk.cc b/printing/print_settings_initializer_gtk.cc
index 92316a6..60f60ce 100644
--- a/printing/print_settings_initializer_gtk.cc
+++ b/printing/print_settings_initializer_gtk.cc
@@ -8,7 +8,7 @@
#include <gtk/gtkunixprint.h>
#include "base/string16.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "printing/print_settings.h"
#include "printing/units.h"
diff --git a/printing/printed_document.cc b/printing/printed_document.cc
index 17e4c35..052a78c 100644
--- a/printing/printed_document.cc
+++ b/printing/printed_document.cc
@@ -17,7 +17,7 @@
#include "base/message_loop.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "printing/page_number.h"
#include "printing/printed_page.h"
#include "printing/printed_pages_source.h"
diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc
index e5e6151..b5a57cf 100644
--- a/printing/printing_context_win.cc
+++ b/printing/printing_context_win.cc
@@ -12,8 +12,8 @@
#include "base/i18n/time_formatting.h"
#include "base/message_loop.h"
#include "base/metrics/histogram.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "base/win/metro.h"
#include "printing/backend/print_backend.h"