diff options
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/display_controller.cc | 2 | ||||
| -rw-r--r-- | ash/display/display_info.cc | 4 | ||||
| -rw-r--r-- | ash/display/display_manager.cc | 2 | ||||
| -rw-r--r-- | ash/display/display_manager_unittest.cc | 2 | ||||
| -rw-r--r-- | ash/display/mirror_window_controller.cc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index f9374cd..bc1aeff 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -21,9 +21,9 @@ #include "ash/wm/window_util.h" #include "base/command_line.h" #include "base/json/json_value_converter.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" +#include "base/strings/stringprintf.h" #include "base/values.h" #include "third_party/skia/include/utils/SkMatrix44.h" #include "ui/aura/client/activation_client.h" diff --git a/ash/display/display_info.cc b/ash/display/display_info.cc index 1052bf9..446a0ca 100644 --- a/ash/display/display_info.cc +++ b/ash/display/display_info.cc @@ -8,9 +8,9 @@ #include "ash/display/display_info.h" #include "base/logging.h" -#include "base/string_util.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "ui/gfx/display.h" #include "ui/gfx/size_conversions.h" #include "ui/gfx/size_f.h" diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc index 57441d7..980a3852 100644 --- a/ash/display/display_manager.cc +++ b/ash/display/display_manager.cc @@ -18,9 +18,9 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/stl_util.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "grit/ash_strings.h" #include "ui/aura/client/screen_position_client.h" diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc index 8b1516b..694b722 100644 --- a/ash/display/display_manager_unittest.cc +++ b/ash/display/display_manager_unittest.cc @@ -11,7 +11,7 @@ #include "ash/test/display_manager_test_api.h" #include "ash/test/mirror_window_test_api.h" #include "base/format_macros.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc index 616cf4b..739bac0 100644 --- a/ash/display/mirror_window_controller.cc +++ b/ash/display/mirror_window_controller.cc @@ -16,7 +16,7 @@ #include "ash/display/root_window_transformers.h" #include "ash/host/root_window_host_factory.h" #include "ash/shell.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" |