summaryrefslogtreecommitdiffstats
path: root/chrome/browser/web_applications
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-10 21:49:34 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-10 21:49:34 +0000
commit9f0abdb589906d37f1409e17410695c17c46f1df (patch)
tree76c84a591d7e1abfc4c57b8e13700bb12ef14930 /chrome/browser/web_applications
parent0e2fc55a3bcb81b5b3e1aac09f5c4865209032ca (diff)
downloadchromium_src-9f0abdb589906d37f1409e17410695c17c46f1df.zip
chromium_src-9f0abdb589906d37f1409e17410695c17c46f1df.tar.gz
chromium_src-9f0abdb589906d37f1409e17410695c17c46f1df.tar.bz2
Use a direct include of strings headers in chrome/browser/t*-w*/.
BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/15906012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205314 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_applications')
-rw-r--r--chrome/browser/web_applications/web_app.cc2
-rw-r--r--chrome/browser/web_applications/web_app.h2
-rw-r--r--chrome/browser/web_applications/web_app_mac.h2
-rw-r--r--chrome/browser/web_applications/web_app_mac.mm2
-rw-r--r--chrome/browser/web_applications/web_app_unittest.cc2
-rw-r--r--chrome/browser/web_applications/web_app_win.cc2
6 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
index 094b153..de8e048 100644
--- a/chrome/browser/web_applications/web_app.cc
+++ b/chrome/browser/web_applications/web_app.cc
@@ -8,7 +8,7 @@
#include "base/bind_helpers.h"
#include "base/file_util.h"
#include "base/i18n/file_util_icu.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread.h"
#include "chrome/common/chrome_constants.h"
diff --git a/chrome/browser/web_applications/web_app.h b/chrome/browser/web_applications/web_app.h
index 2e529b1..f4c647c 100644
--- a/chrome/browser/web_applications/web_app.h
+++ b/chrome/browser/web_applications/web_app.h
@@ -9,7 +9,7 @@
#include <vector>
#include "base/files/file_path.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "build/build_config.h"
#include "chrome/browser/shell_integration.h"
#include "chrome/common/web_application_info.h"
diff --git a/chrome/browser/web_applications/web_app_mac.h b/chrome/browser/web_applications/web_app_mac.h
index d20aa22..676b208 100644
--- a/chrome/browser/web_applications/web_app_mac.h
+++ b/chrome/browser/web_applications/web_app_mac.h
@@ -7,7 +7,7 @@
#include "base/files/file_path.h"
#include "base/gtest_prod_util.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "chrome/browser/shell_integration.h"
#ifdef __OBJC__
diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm
index 0439b32..825e908 100644
--- a/chrome/browser/web_applications/web_app_mac.mm
+++ b/chrome/browser/web_applications/web_app_mac.mm
@@ -18,9 +18,9 @@
#include "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/memory/scoped_nsobject.h"
+#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/string_util.h"
#include "chrome/browser/ui/web_applications/web_app_ui.h"
#include "chrome/browser/web_applications/web_app.h"
#include "chrome/common/chrome_paths_internal.h"
diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc
index 1f4bb35..e078f88 100644
--- a/chrome/browser/web_applications/web_app_unittest.cc
+++ b/chrome/browser/web_applications/web_app_unittest.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/web_applications/web_app.h"
#include "base/files/file_path.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
diff --git a/chrome/browser/web_applications/web_app_win.cc b/chrome/browser/web_applications/web_app_win.cc
index 5539c2f..9e3c5ee 100644
--- a/chrome/browser/web_applications/web_app_win.cc
+++ b/chrome/browser/web_applications/web_app_win.cc
@@ -11,8 +11,8 @@
#include "base/logging.h"
#include "base/md5.h"
#include "base/path_service.h"
-#include "base/stringprintf.h"
#include "base/strings/string_piece.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/shortcut.h"
#include "base/win/windows_version.h"