Use a direct include of strings headers in ui/, part 3.

BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16757004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205537 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Jun 11, 2013 · f3652ff · f3652ff
1 parent cac23aa
commit f3652ff
Show file tree

Hide file tree

Showing 92 changed files with 104 additions and 104 deletions.
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
@@ -12,7 +12,7 @@
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "cc/base/switches.h"

diff --git a/ui/compositor/layer_animator_unittest.cc b/ui/compositor/layer_animator_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/layer_animation_delegate.h"

diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc
@@ -10,8 +10,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "cc/layers/layer.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/test/pixel_test_utils.h"

diff --git a/ui/gfx/canvas.h b/ui/gfx/canvas.h
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/refptr.h"
 #include "ui/gfx/image/image_skia.h"

diff --git a/ui/gfx/codec/png_codec.cc b/ui/gfx/codec/png_codec.cc
@@ -5,14 +5,14 @@
 #include "ui/gfx/codec/png_codec.h"
 
 #include "base/logging.h"
-#include "base/string_util.h"
-#include "ui/gfx/size.h"
-#include "ui/gfx/skia_util.h"
+#include "base/strings/string_util.h"
 #include "third_party/libpng/png.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkUnPreMultiply.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
+#include "third_party/skia/include/core/SkUnPreMultiply.h"
 #include "third_party/zlib/zlib.h"
+#include "ui/gfx/size.h"
+#include "ui/gfx/skia_util.h"
 
 namespace gfx {
 

diff --git a/ui/gfx/display.cc b/ui/gfx/display.cc
@@ -6,8 +6,8 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "base/string_number_conversions.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/point_conversions.h"

diff --git a/ui/gfx/font.h b/ui/gfx/font.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/memory/ref_counted.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/base/ui_export.h"
 #include "ui/gfx/native_widget_types.h"
 

diff --git 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_util.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "base/strings/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
@@ -5,9 +5,9 @@
 #include <stdlib.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_split.h"
+#include "base/strings/string_util.h"
 #include "ui/gfx/font_list.h"
 
 namespace {

diff --git a/ui/gfx/font_list_unittest.cc b/ui/gfx/font_list_unittest.cc
@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

diff --git a/ui/gfx/font_unittest.cc b/ui/gfx/font_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "ui/gfx/font.h"
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

diff --git a/ui/gfx/insets.cc b/ui/gfx/insets.cc
@@ -8,7 +8,7 @@
 #include <gtk/gtk.h>
 #endif
 
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 
 namespace gfx {
 

diff --git a/ui/gfx/insets_f.cc b/ui/gfx/insets_f.cc
@@ -4,7 +4,7 @@
 
 #include "ui/gfx/insets_f.h"
 
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 
 namespace gfx {
 

diff --git a/ui/gfx/pango_util.h b/ui/gfx/pango_util.h
@@ -11,7 +11,7 @@
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/ui_export.h"
 

diff --git a/ui/gfx/platform_font.h b/ui/gfx/platform_font.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/memory/ref_counted.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/base/ui_export.h"
 #include "ui/gfx/native_widget_types.h"
 

diff --git a/ui/gfx/platform_font_win.cc b/ui/gfx/platform_font_win.cc
@@ -11,7 +11,7 @@
 #include <string>
 
 #include "base/logging.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/win/scoped_hdc.h"

diff --git a/ui/gfx/point.cc b/ui/gfx/point.cc
@@ -8,7 +8,7 @@
 #include <windows.h>
 #endif
 
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 
 namespace gfx {
 

diff --git a/ui/gfx/point3_f.cc b/ui/gfx/point3_f.cc
@@ -4,7 +4,7 @@
 
 #include "ui/gfx/point3_f.h"
 
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 
 namespace gfx {
 

diff --git a/ui/gfx/point_f.cc b/ui/gfx/point_f.cc
@@ -4,7 +4,7 @@
 
 #include "ui/gfx/point_f.h"
 
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 
 namespace gfx {
 

diff --git a/ui/gfx/quad_f.cc b/ui/gfx/quad_f.cc
@@ -6,7 +6,7 @@
 
 #include <limits>
 
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 
 namespace gfx {
 

diff --git a/ui/gfx/rect.cc b/ui/gfx/rect.cc
@@ -13,7 +13,7 @@
 #endif
 
 #include "base/logging.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/rect_base_impl.h"
 

diff --git a/ui/views/button_drag_utils.h b/ui/views/button_drag_utils.h
@@ -5,7 +5,7 @@
 #ifndef UI_VIEWS_BUTTON_DRAG_UTILS_H_
 #define UI_VIEWS_BUTTON_DRAG_UTILS_H_
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/views/views_export.h"
 
 class GURL;

diff --git a/ui/views/color_chooser/color_chooser_view.cc b/ui/views/color_chooser/color_chooser_view.cc
@@ -5,8 +5,8 @@
 #include "ui/views/color_chooser/color_chooser_view.h"
 
 #include "base/logging.h"
-#include "base/string_number_conversions.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/events/event.h"
 #include "ui/base/keycodes/keyboard_codes.h"

diff --git a/ui/views/controls/button/blue_button.h b/ui/views/controls/button/blue_button.h
@@ -6,7 +6,7 @@
 #define UI_VIEWS_CONTROLS_BUTTON_BLUE_BUTTON_H_
 
 #include "base/compiler_specific.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/views/controls/button/label_button.h"
 
 namespace views {

diff --git a/ui/views/controls/button/checkbox.h b/ui/views/controls/button/checkbox.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/views/controls/button/label_button.h"
 
 namespace views {

diff --git a/ui/views/controls/button/menu_button.h b/ui/views/controls/button/menu_button.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/time.h"
 #include "ui/gfx/font.h"
 #include "ui/views/background.h"

diff --git a/ui/views/controls/button/radio_button.h b/ui/views/controls/button/radio_button.h
@@ -5,7 +5,7 @@
 #ifndef UI_VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/views/controls/button/checkbox.h"
 
 namespace views {

diff --git a/ui/views/controls/button/text_button.h b/ui/views/controls/button/text_button.h
@@ -9,7 +9,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image_skia.h"

diff --git 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_util.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "base/strings/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/label.h b/ui/views/controls/label.h
@@ -10,7 +10,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/text_constants.h"

diff --git a/ui/views/controls/menu/menu.h b/ui/views/controls/menu/menu.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/views_export.h"
 

diff --git a/ui/views/controls/menu/menu_delegate.h b/ui/views/controls/menu/menu_delegate.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/logging.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/views/controls/menu/menu_item_view.h"

diff --git a/ui/views/controls/menu/menu_item_view.h b/ui/views/controls/menu/menu_item_view.h
@@ -10,7 +10,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "ui/base/models/menu_separator_types.h"
 #include "ui/gfx/image/image_skia.h"

diff --git a/ui/views/controls/menu/menu_win.cc b/ui/views/controls/menu/menu_win.cc
@@ -8,7 +8,7 @@
 
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"

diff --git a/ui/views/controls/menu/native_menu_win.cc b/ui/views/controls/menu/native_menu_win.cc
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/win/wrapped_window_proc.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/keycodes/keyboard_codes.h"

diff --git a/ui/views/controls/menu/native_menu_win.h b/ui/views/controls/menu/native_menu_win.h
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/views/controls/menu/menu_wrapper.h"
 #include "ui/views/views_export.h"
 

diff --git a/ui/views/controls/message_box_view.h b/ui/views/controls/message_box_view.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/views/view.h"
 
 namespace gfx {

diff --git a/ui/views/controls/scrollbar/base_scroll_bar.cc b/ui/views/controls/scrollbar/base_scroll_bar.cc
@@ -9,7 +9,7 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "grit/ui_strings.h"

diff --git a/ui/views/controls/scrollbar/bitmap_scroll_bar.cc b/ui/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -9,7 +9,7 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "grit/ui_strings.h"

diff --git a/ui/views/controls/slider.cc b/ui/views/controls/slider.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"

diff --git a/ui/views/controls/slider_unittest.cc b/ui/views/controls/slider_unittest.cc
@@ -5,7 +5,7 @@
 #include "ui/views/controls/slider.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accessibility/accessible_view_state.h"

diff --git a/ui/views/controls/styled_label.cc b/ui/views/controls/styled_label.cc
@@ -6,7 +6,7 @@
 
 #include <vector>
 
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"