diff options
21 files changed, 23 insertions, 23 deletions
diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc index 43e8032..0386b3b 100644 --- a/ash/system/date/tray_date.cc +++ b/ash/system/date/tray_date.cc @@ -15,7 +15,7 @@ #include "ash/system/tray/tray_item_view.h" #include "ash/system/tray/tray_popup_header_button.h" #include "base/i18n/time_formatting.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" #include "base/timer.h" diff --git a/ash/system/locale/tray_locale.cc b/ash/system/locale/tray_locale.cc index 3972b2e..8a59fcc 100644 --- a/ash/system/locale/tray_locale.cc +++ b/ash/system/locale/tray_locale.cc @@ -8,16 +8,16 @@ #include "ash/system/tray/system_tray_notifier.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_notification_view.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/views/view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" #include "ui/views/controls/link_listener.h" #include "ui/views/layout/box_layout.h" +#include "ui/views/view.h" namespace ash { namespace internal { diff --git a/ash/system/logout_button/tray_logout_button.cc b/ash/system/logout_button/tray_logout_button.cc index f7c6d1d..102329c 100644 --- a/ash/system/logout_button/tray_logout_button.cc +++ b/ash/system/logout_button/tray_logout_button.cc @@ -12,7 +12,7 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/user/login_status.h" #include "base/logging.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "grit/ash_resources.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/views/border.h" diff --git a/ash/system/monitor/tray_monitor.cc b/ash/system/monitor/tray_monitor.cc index 69d1e0a..b9e6e63 100644 --- a/ash/system/monitor/tray_monitor.cc +++ b/ash/system/monitor/tray_monitor.cc @@ -6,7 +6,7 @@ #include "ash/system/tray/tray_item_view.h" #include "base/process_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/gpu_data_manager.h" #include "ui/base/text/bytes_formatting.h" diff --git a/ash/system/session_length_limit/tray_session_length_limit.cc b/ash/system/session_length_limit/tray_session_length_limit.cc index 6142663..1b2b944 100644 --- a/ash/system/session_length_limit/tray_session_length_limit.cc +++ b/ash/system/session_length_limit/tray_session_length_limit.cc @@ -16,7 +16,7 @@ #include "ash/system/tray/tray_utils.h" #include "base/location.h" #include "base/logging.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "grit/ash_resources.h" diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h index 763c59d..847ff8c 100644 --- a/ash/system/tray/system_tray_delegate.h +++ b/ash/system/tray/system_tray_delegate.h @@ -13,7 +13,7 @@ #include "base/files/file_path.h" #include "base/i18n/time_formatting.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "ui/gfx/image/image_skia.h" namespace base { diff --git a/ash/system/tray/tray_popup_label_button.h b/ash/system/tray/tray_popup_label_button.h index 9f4d262..8d21abd 100644 --- a/ash/system/tray/tray_popup_label_button.h +++ b/ash/system/tray/tray_popup_label_button.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "ui/views/controls/button/label_button.h" namespace ash { diff --git a/ash/system/user/login_status.cc b/ash/system/user/login_status.cc index ea35ee2..93678fd 100644 --- a/ash/system/user/login_status.cc +++ b/ash/system/user/login_status.cc @@ -6,7 +6,7 @@ #include "ash/session_state_delegate.h" #include "ash/shell.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "grit/ash_strings.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ash/system/user/login_status.h b/ash/system/user/login_status.h index c5be026..d08a160 100644 --- a/ash/system/user/login_status.h +++ b/ash/system/user/login_status.h @@ -5,7 +5,7 @@ #ifndef ASH_SYSTEM_USER_LOGIN_STATUS_H_ #define ASH_SYSTEM_USER_LOGIN_STATUS_H_ -#include "base/string16.h" +#include "base/strings/string16.h" namespace ash { namespace user { diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc index 8134485..1566371 100644 --- a/ash/system/user/tray_user.cc +++ b/ash/system/user/tray_user.cc @@ -23,8 +23,8 @@ #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/memory/scoped_vector.h" -#include "base/string16.h" -#include "base/string_util.h" +#include "base/strings/string16.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc index ccd4d4d..71dfc40 100644 --- a/ash/system/web_notification/web_notification_tray_unittest.cc +++ b/ash/system/web_notification/web_notification_tray_unittest.cc @@ -12,7 +12,7 @@ #include "ash/system/status_area_widget.h" #include "ash/system/tray/system_tray_item.h" #include "ash/test/ash_test_base.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "ui/message_center/message_center_style.h" #include "ui/message_center/message_center_tray.h" diff --git a/ash/test/test_metro_viewer_process_host.cc b/ash/test/test_metro_viewer_process_host.cc index a7c8504..3819d35 100644 --- a/ash/test/test_metro_viewer_process_host.cc +++ b/ash/test/test_metro_viewer_process_host.cc @@ -10,7 +10,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/files/file_path.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/time.h" #include "base/win/scoped_com_initializer.h" #include "base/win/scoped_comptr.h" diff --git a/ash/test/test_session_state_delegate.cc b/ash/test/test_session_state_delegate.cc index e1df9a7..a8ee01e 100644 --- a/ash/test/test_session_state_delegate.cc +++ b/ash/test/test_session_state_delegate.cc @@ -4,7 +4,7 @@ #include "ash/test/test_session_state_delegate.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" namespace ash { diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc index f480c9c..e628f89 100644 --- a/ash/touch/touch_observer_hud.cc +++ b/ash/touch/touch_observer_hud.cc @@ -10,8 +10,8 @@ #include "ash/shell_window_ids.h" #include "ash/wm/property_util.h" #include "base/json/json_string_value_serializer.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 "third_party/skia/include/core/SkPath.h" #include "third_party/skia/include/core/SkXfermode.h" diff --git a/ash/touch/touch_observer_hud_unittest.cc b/ash/touch/touch_observer_hud_unittest.cc index 2e86990..c616f6f 100644 --- a/ash/touch/touch_observer_hud_unittest.cc +++ b/ash/touch/touch_observer_hud_unittest.cc @@ -12,7 +12,7 @@ #include "ash/wm/property_util.h" #include "base/command_line.h" #include "base/format_macros.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" namespace ash { namespace internal { diff --git a/ash/touch/touch_uma.cc b/ash/touch/touch_uma.cc index cf42052..663a319 100644 --- a/ash/touch/touch_uma.cc +++ b/ash/touch/touch_uma.cc @@ -6,7 +6,7 @@ #include "ash/shell_delegate.h" #include "base/metrics/histogram.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" diff --git a/ash/wm/ash_native_cursor_manager.h b/ash/wm/ash_native_cursor_manager.h index 375e0c6..60eec94 100644 --- a/ash/wm/ash_native_cursor_manager.h +++ b/ash/wm/ash_native_cursor_manager.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.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/gfx/point.h" #include "ui/views/corewm/native_cursor_manager.h" diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc index d95fcba..4f8e517 100644 --- a/ash/wm/drag_window_resizer_unittest.cc +++ b/ash/wm/drag_window_resizer_unittest.cc @@ -12,7 +12,7 @@ #include "ash/test/ash_test_base.h" #include "ash/test/cursor_manager_test_api.h" #include "ash/wm/drag_window_controller.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/root_window.h" #include "ui/aura/test/test_window_delegate.h" diff --git a/ash/wm/image_cursors.cc b/ash/wm/image_cursors.cc index 63b2335..d89cfa7 100644 --- a/ash/wm/image_cursors.cc +++ b/ash/wm/image_cursors.cc @@ -7,7 +7,7 @@ #include <float.h> #include "base/logging.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "ui/base/cursor/cursor.h" #include "ui/base/cursor/cursor_loader.h" #include "ui/base/cursor/cursors_aura.h" diff --git a/ash/wm/image_cursors.h b/ash/wm/image_cursors.h index c01ec62..8f0ab2b 100644 --- a/ash/wm/image_cursors.h +++ b/ash/wm/image_cursors.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "ui/gfx/native_widget_types.h" namespace gfx { diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc index a0a8561..3de8814 100644 --- a/ash/wm/workspace/workspace_window_resizer_unittest.cc +++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc @@ -18,8 +18,8 @@ #include "ash/wm/workspace/snap_sizer.h" #include "ash/wm/workspace_controller.h" #include "base/command_line.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/root_window.h" #include "ui/aura/test/test_window_delegate.h" |