summaryrefslogtreecommitdiffstats
path: root/ui/shell_dialogs
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 19:48:38 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 19:48:38 +0000
commit3b3a306493cf1803dcee9af97d85a11afbc58fd9 (patch)
tree1e147d90cdde9a38d63107e9be14e97123bccf18 /ui/shell_dialogs
parentf3b42ccfb51e178c3902c7c3ddb2680303c38138 (diff)
downloadchromium_src-3b3a306493cf1803dcee9af97d85a11afbc58fd9.zip
chromium_src-3b3a306493cf1803dcee9af97d85a11afbc58fd9.tar.gz
chromium_src-3b3a306493cf1803dcee9af97d85a11afbc58fd9.tar.bz2
Use a direct include of strings headers in ui/, part 2.
BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16431009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205608 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/shell_dialogs')
-rw-r--r--ui/shell_dialogs/gtk/select_file_dialog_impl_gtk.cc2
-rw-r--r--ui/shell_dialogs/gtk/select_file_dialog_impl_kde.cc4
-rw-r--r--ui/shell_dialogs/select_file_dialog.h2
-rw-r--r--ui/shell_dialogs/select_file_dialog_android.cc2
-rw-r--r--ui/shell_dialogs/selected_file_info.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/ui/shell_dialogs/gtk/select_file_dialog_impl_gtk.cc b/ui/shell_dialogs/gtk/select_file_dialog_impl_gtk.cc
index c57acdf..d55631a 100644
--- a/ui/shell_dialogs/gtk/select_file_dialog_impl_gtk.cc
+++ b/ui/shell_dialogs/gtk/select_file_dialog_impl_gtk.cc
@@ -11,7 +11,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread.h"
diff --git a/ui/shell_dialogs/gtk/select_file_dialog_impl_kde.cc b/ui/shell_dialogs/gtk/select_file_dialog_impl_kde.cc
index 98ed98b..e4c6b38 100644
--- a/ui/shell_dialogs/gtk/select_file_dialog_impl_kde.cc
+++ b/ui/shell_dialogs/gtk/select_file_dialog_impl_kde.cc
@@ -13,8 +13,8 @@
#include "base/nix/mime_util_xdg.h"
#include "base/nix/xdg_util.h"
#include "base/process_util.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/utf_string_conversions.h"
#include "base/threading/thread_restrictions.h"
#include "base/threading/worker_pool.h"
diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_file_dialog.h
index 9ea0bc4..dc3c813 100644
--- a/ui/shell_dialogs/select_file_dialog.h
+++ b/ui/shell_dialogs/select_file_dialog.h
@@ -13,7 +13,7 @@
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/shell_dialogs/base_shell_dialog.h"
#include "ui/shell_dialogs/shell_dialogs_export.h"
diff --git a/ui/shell_dialogs/select_file_dialog_android.cc b/ui/shell_dialogs/select_file_dialog_android.cc
index 3886303..b4dc7e8 100644
--- a/ui/shell_dialogs/select_file_dialog_android.cc
+++ b/ui/shell_dialogs/select_file_dialog_android.cc
@@ -9,8 +9,8 @@
#include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.h"
#include "base/logging.h"
-#include "base/string_util.h"
#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "jni/SelectFileDialog_jni.h"
#include "ui/android/window_android.h"
diff --git a/ui/shell_dialogs/selected_file_info.h b/ui/shell_dialogs/selected_file_info.h
index fc8e1bd..a2e9134 100644
--- a/ui/shell_dialogs/selected_file_info.h
+++ b/ui/shell_dialogs/selected_file_info.h
@@ -8,7 +8,7 @@
#include <vector>
#include "base/files/file_path.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "ui/shell_dialogs/shell_dialogs_export.h"
namespace ui {