summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/aura/bench/bench_main.cc2
-rw-r--r--ui/base/l10n/l10n_util.cc4
-rw-r--r--ui/base/text/text_elider.cc2
-rw-r--r--ui/base/touch/touch_factory.cc2
-rw-r--r--ui/base/x/events_x.cc2
-rw-r--r--ui/gfx/font_fallback_win.cc2
-rw-r--r--ui/gfx/font_list.cc2
-rw-r--r--ui/gfx/platform_font_pango.cc2
-rw-r--r--ui/shell_dialogs/select_file_dialog_android.cc4
-rw-r--r--ui/shell_dialogs/select_file_dialog_win.cc2
-rw-r--r--ui/views/controls/label.cc2
-rw-r--r--ui/views/controls/message_box_view.cc2
-rw-r--r--ui/views/corewm/tooltip_controller.cc2
-rw-r--r--ui/views/widget/tooltip_manager.cc2
14 files changed, 16 insertions, 16 deletions
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc
index 3daedeb..38581f6 100644
--- a/ui/aura/bench/bench_main.cc
+++ b/ui/aura/bench/bench_main.cc
@@ -8,7 +8,7 @@
#include "base/i18n/icu_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/string_split.h"
+#include "base/strings/string_split.h"
#include "base/time.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "third_party/skia/include/core/SkXfermode.h"
diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc
index 457485f..8078d1b 100644
--- a/ui/base/l10n/l10n_util.cc
+++ b/ui/base/l10n/l10n_util.cc
@@ -16,10 +16,10 @@
#include "base/i18n/rtl.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
-#include "base/stringprintf.h"
#include "base/string_number_conversions.h"
-#include "base/string_split.h"
#include "base/string_util.h"
+#include "base/stringprintf.h"
+#include "base/strings/string_split.h"
#include "base/sys_string_conversions.h"
#include "base/utf_string_conversions.h"
#include "build/build_config.h"
diff --git a/ui/base/text/text_elider.cc b/ui/base/text/text_elider.cc
index 5479f57..9b57273 100644
--- a/ui/base/text/text_elider.cc
+++ b/ui/base/text/text_elider.cc
@@ -17,8 +17,8 @@
#include "base/i18n/char_iterator.h"
#include "base/i18n/rtl.h"
#include "base/memory/scoped_ptr.h"
-#include "base/string_split.h"
#include "base/string_util.h"
+#include "base/strings/string_split.h"
#include "base/sys_string_conversions.h"
#include "base/utf_string_conversions.h"
#include "googleurl/src/gurl.h"
diff --git a/ui/base/touch/touch_factory.cc b/ui/base/touch/touch_factory.cc
index e260387..1b1c42d 100644
--- a/ui/base/touch/touch_factory.cc
+++ b/ui/base/touch/touch_factory.cc
@@ -16,7 +16,7 @@
#include "base/memory/singleton.h"
#include "base/message_loop.h"
#include "base/string_number_conversions.h"
-#include "base/string_split.h"
+#include "base/strings/string_split.h"
#include "ui/base/ui_base_switches.h"
#include "ui/base/x/device_list_cache_x.h"
#include "ui/base/x/x11_util.h"
diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc
index e4ca121..7124c1a 100644
--- a/ui/base/x/events_x.cc
+++ b/ui/base/x/events_x.cc
@@ -14,7 +14,7 @@
#include "base/memory/singleton.h"
#include "base/message_pump_aurax11.h"
#include "base/string_number_conversions.h"
-#include "base/string_split.h"
+#include "base/strings/string_split.h"
#include "ui/base/events/event_utils.h"
#include "ui/base/keycodes/keyboard_code_conversion_x.h"
#include "ui/base/touch/touch_factory.h"
diff --git a/ui/gfx/font_fallback_win.cc b/ui/gfx/font_fallback_win.cc
index 22cac14..c6821722 100644
--- a/ui/gfx/font_fallback_win.cc
+++ b/ui/gfx/font_fallback_win.cc
@@ -7,8 +7,8 @@
#include <map>
#include "base/memory/singleton.h"
-#include "base/string_split.h"
#include "base/string_util.h"
+#include "base/strings/string_split.h"
#include "base/utf_string_conversions.h"
#include "base/win/registry.h"
#include "ui/gfx/font.h"
diff --git a/ui/gfx/font_list.cc b/ui/gfx/font_list.cc
index 464e722..12a4ac6 100644
--- a/ui/gfx/font_list.cc
+++ b/ui/gfx/font_list.cc
@@ -6,8 +6,8 @@
#include "base/logging.h"
#include "base/string_number_conversions.h"
-#include "base/string_split.h"
#include "base/string_util.h"
+#include "base/strings/string_split.h"
#include "ui/gfx/font_list.h"
namespace {
diff --git a/ui/gfx/platform_font_pango.cc b/ui/gfx/platform_font_pango.cc
index 3d2b986..539e50b 100644
--- a/ui/gfx/platform_font_pango.cc
+++ b/ui/gfx/platform_font_pango.cc
@@ -12,7 +12,7 @@
#include "base/logging.h"
#include "base/string_piece.h"
-#include "base/string_split.h"
+#include "base/strings/string_split.h"
#include "base/utf_string_conversions.h"
#include "grit/app_locale_settings.h"
#include "third_party/skia/include/core/SkPaint.h"
diff --git a/ui/shell_dialogs/select_file_dialog_android.cc b/ui/shell_dialogs/select_file_dialog_android.cc
index d46e37e..740939f 100644
--- a/ui/shell_dialogs/select_file_dialog_android.cc
+++ b/ui/shell_dialogs/select_file_dialog_android.cc
@@ -5,12 +5,12 @@
#include "select_file_dialog_android.h"
#include "base/android/jni_android.h"
-#include "base/android/jni_string.h"
#include "base/android/jni_array.h"
+#include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.h"
#include "base/logging.h"
-#include "base/string_split.h"
#include "base/string_util.h"
+#include "base/strings/string_split.h"
#include "base/utf_string_conversions.h"
#include "jni/SelectFileDialog_jni.h"
#include "ui/gfx/android/window_android.h"
diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/select_file_dialog_win.cc
index 940eb512..19a083f 100644
--- a/ui/shell_dialogs/select_file_dialog_win.cc
+++ b/ui/shell_dialogs/select_file_dialog_win.cc
@@ -17,7 +17,7 @@
#include "base/i18n/case_conversion.h"
#include "base/message_loop.h"
#include "base/message_loop_proxy.h"
-#include "base/string_split.h"
+#include "base/strings/string_split.h"
#include "base/threading/thread.h"
#include "base/utf_string_conversions.h"
#include "base/win/metro.h"
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
index d2472d8..93afc06 100644
--- a/ui/views/controls/label.cc
+++ b/ui/views/controls/label.cc
@@ -11,8 +11,8 @@
#include "base/i18n/rtl.h"
#include "base/logging.h"
-#include "base/string_split.h"
#include "base/string_util.h"
+#include "base/strings/string_split.h"
#include "base/utf_string_conversions.h"
#include "ui/base/accessibility/accessible_view_state.h"
#include "ui/base/resource/resource_bundle.h"
diff --git a/ui/views/controls/message_box_view.cc b/ui/views/controls/message_box_view.cc
index bfea5c9..823f9cf 100644
--- a/ui/views/controls/message_box_view.cc
+++ b/ui/views/controls/message_box_view.cc
@@ -6,7 +6,7 @@
#include "base/i18n/rtl.h"
#include "base/message_loop.h"
-#include "base/string_split.h"
+#include "base/strings/string_split.h"
#include "base/utf_string_conversions.h"
#include "ui/base/accessibility/accessible_view_state.h"
#include "ui/base/clipboard/clipboard.h"
diff --git a/ui/views/corewm/tooltip_controller.cc b/ui/views/corewm/tooltip_controller.cc
index 0f63063..6a0608e 100644
--- a/ui/views/corewm/tooltip_controller.cc
+++ b/ui/views/corewm/tooltip_controller.cc
@@ -8,7 +8,7 @@
#include "base/command_line.h"
#include "base/location.h"
-#include "base/string_split.h"
+#include "base/strings/string_split.h"
#include "base/time.h"
#include "ui/aura/client/cursor_client.h"
#include "ui/aura/client/drag_drop_client.h"
diff --git a/ui/views/widget/tooltip_manager.cc b/ui/views/widget/tooltip_manager.cc
index afd6866..500b2a4 100644
--- a/ui/views/widget/tooltip_manager.cc
+++ b/ui/views/widget/tooltip_manager.cc
@@ -6,7 +6,7 @@
#include <vector>
-#include "base/string_split.h"
+#include "base/strings/string_split.h"
#include "base/utf_string_conversions.h"
#include "ui/base/text/text_elider.h"
generated by cgit v1.1 at 2025-02-16 10:33:36 +0000