summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 22:52:24 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 22:52:24 +0000
commit896d161ffcd8b39487e339d1169ab60e040cfd44 (patch)
treed69a937cb641accab3d8c1e19e374b5cbb863673 /printing
parent516f018648a3188a8f36b6f7b5dab8530595637d (diff)
downloadchromium_src-896d161ffcd8b39487e339d1169ab60e040cfd44.zip
chromium_src-896d161ffcd8b39487e339d1169ab60e040cfd44.tar.gz
chromium_src-896d161ffcd8b39487e339d1169ab60e040cfd44.tar.bz2
Use a direct include of strings headers in ppapi/, printing/.
BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16366009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
-rw-r--r--printing/backend/cups_helper.cc4
-rw-r--r--printing/backend/print_backend.h2
-rw-r--r--printing/backend/print_backend_cups.cc2
-rw-r--r--printing/backend/win_helper.h2
-rw-r--r--printing/image.cc2
-rw-r--r--printing/print_dialog_gtk_interface.h2
-rw-r--r--printing/print_settings.h2
-rw-r--r--printing/print_settings_initializer.cc2
-rw-r--r--printing/print_settings_initializer_gtk.cc2
-rw-r--r--printing/printed_document.cc4
-rw-r--r--printing/printed_document.h2
-rw-r--r--printing/printed_pages_source.h2
-rw-r--r--printing/printing_context.h2
13 files changed, 15 insertions, 15 deletions
diff --git a/printing/backend/cups_helper.cc b/printing/backend/cups_helper.cc
index fecd18a2..2159aaf 100644
--- a/printing/backend/cups_helper.cc
+++ b/printing/backend/cups_helper.cc
@@ -8,8 +8,8 @@
#include "base/file_util.h"
#include "base/logging.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
#include "base/strings/string_split.h"
#include "base/values.h"
#include "googleurl/src/gurl.h"
diff --git a/printing/backend/print_backend.h b/printing/backend/print_backend.h
index df9e622..6a50e74 100644
--- a/printing/backend/print_backend.h
+++ b/printing/backend/print_backend.h
@@ -10,7 +10,7 @@
#include <vector>
#include "base/memory/ref_counted.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "printing/print_job_constants.h"
#include "printing/printing_export.h"
diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc
index 267c2d9..1f40e59 100644
--- a/printing/backend/print_backend_cups.cc
+++ b/printing/backend/print_backend_cups.cc
@@ -19,7 +19,7 @@
#include "base/file_util.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
#include "base/synchronization/lock.h"
#include "base/values.h"
#include "googleurl/src/gurl.h"
diff --git a/printing/backend/win_helper.h b/printing/backend/win_helper.h
index d0f8b35..d340b67 100644
--- a/printing/backend/win_helper.h
+++ b/printing/backend/win_helper.h
@@ -12,7 +12,7 @@
#include <string>
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "base/win/scoped_handle.h"
#include "printing/printing_export.h"
diff --git a/printing/image.cc b/printing/image.cc
index 099fcd7..47ce089 100644
--- a/printing/image.cc
+++ b/printing/image.cc
@@ -9,7 +9,7 @@
#include "base/file_util.h"
#include "base/md5.h"
#include "base/safe_numerics.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
#include "printing/metafile.h"
#include "printing/metafile_impl.h"
#include "third_party/skia/include/core/SkColor.h"
diff --git a/printing/print_dialog_gtk_interface.h b/printing/print_dialog_gtk_interface.h
index 46531be..fc238c7 100644
--- a/printing/print_dialog_gtk_interface.h
+++ b/printing/print_dialog_gtk_interface.h
@@ -5,7 +5,7 @@
#ifndef PRINTING_PRINT_DIALOG_GTK_INTERFACE_H_
#define PRINTING_PRINT_DIALOG_GTK_INTERFACE_H_
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "printing/printing_context_gtk.h"
#include "ui/gfx/native_widget_types.h"
diff --git a/printing/print_settings.h b/printing/print_settings.h
index 3a55502..5728bf7 100644
--- a/printing/print_settings.h
+++ b/printing/print_settings.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "printing/page_range.h"
#include "printing/page_setup.h"
#include "printing/print_job_constants.h"
diff --git a/printing/print_settings_initializer.cc b/printing/print_settings_initializer.cc
index ed5ba07..8f5e44a 100644
--- a/printing/print_settings_initializer.cc
+++ b/printing/print_settings_initializer.cc
@@ -9,7 +9,7 @@
#include <string>
#include "base/i18n/time_formatting.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
#include "base/values.h"
diff --git a/printing/print_settings_initializer_gtk.cc b/printing/print_settings_initializer_gtk.cc
index 60f60ce..d4f21ed 100644
--- a/printing/print_settings_initializer_gtk.cc
+++ b/printing/print_settings_initializer_gtk.cc
@@ -7,7 +7,7 @@
#include <gtk/gtk.h>
#include <gtk/gtkunixprint.h>
-#include "base/string16.h"
+#include "base/strings/string16.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 052a78c..6490c13 100644
--- a/printing/printed_document.cc
+++ b/printing/printed_document.cc
@@ -15,8 +15,8 @@
#include "base/i18n/time_formatting.h"
#include "base/lazy_instance.h"
#include "base/message_loop.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "printing/page_number.h"
#include "printing/printed_page.h"
diff --git a/printing/printed_document.h b/printing/printed_document.h
index 8093769..4ebcfbf 100644
--- a/printing/printed_document.h
+++ b/printing/printed_document.h
@@ -8,7 +8,7 @@
#include <map>
#include "base/memory/ref_counted.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "base/synchronization/lock.h"
#include "printing/print_settings.h"
#include "ui/gfx/native_widget_types.h"
diff --git a/printing/printed_pages_source.h b/printing/printed_pages_source.h
index 0f90b36..6da9ddb 100644
--- a/printing/printed_pages_source.h
+++ b/printing/printed_pages_source.h
@@ -5,7 +5,7 @@
#ifndef PRINTING_PRINTED_PAGES_SOURCE_H_
#define PRINTING_PRINTED_PAGES_SOURCE_H_
-#include "base/string16.h"
+#include "base/strings/string16.h"
namespace printing {
diff --git a/printing/printing_context.h b/printing/printing_context.h
index 60ea0be..6ad1e8d 100644
--- a/printing/printing_context.h
+++ b/printing/printing_context.h
@@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/callback.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "printing/print_settings.h"
#include "ui/gfx/native_widget_types.h"