diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-10 19:33:35 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-10 19:33:35 +0000 |
| commit | 0836da0963a43e9abd8dae4bcadbec05e570cb96 (patch) | |
| tree | 9cef7995c5b7491ccb056142f585af7ae548d157 /ash/launcher | |
| parent | 7dd182324b86eefe7e3e3078daf0fd1d59031c7f (diff) | |
| download | chromium_src-0836da0963a43e9abd8dae4bcadbec05e570cb96.zip chromium_src-0836da0963a43e9abd8dae4bcadbec05e570cb96.tar.gz chromium_src-0836da0963a43e9abd8dae4bcadbec05e570cb96.tar.bz2 | |
Use a direct include of strings headers in ash/.
BUG=247723
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16739005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205277 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher')
| -rw-r--r-- | ash/launcher/launcher_button_host.h | 2 | ||||
| -rw-r--r-- | ash/launcher/launcher_delegate.h | 2 | ||||
| -rw-r--r-- | ash/launcher/launcher_model_unittest.cc | 2 | ||||
| -rw-r--r-- | ash/launcher/launcher_tooltip_manager.h | 2 | ||||
| -rw-r--r-- | ash/launcher/launcher_tooltip_manager_unittest.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ash/launcher/launcher_button_host.h b/ash/launcher/launcher_button_host.h index c867a68c..46f2e59 100644 --- a/ash/launcher/launcher_button_host.h +++ b/ash/launcher/launcher_button_host.h @@ -6,7 +6,7 @@ #define ASH_LAUNCHER_LAUNCHER_BUTTON_HOST_H_ #include "ash/ash_export.h" -#include "base/string16.h" +#include "base/strings/string16.h" namespace ui { class LocatedEvent; diff --git a/ash/launcher/launcher_delegate.h b/ash/launcher/launcher_delegate.h index a5c1842..cb80588 100644 --- a/ash/launcher/launcher_delegate.h +++ b/ash/launcher/launcher_delegate.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" #include "ash/launcher/launcher_types.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "ui/base/models/simple_menu_model.h" namespace aura { diff --git a/ash/launcher/launcher_model_unittest.cc b/ash/launcher/launcher_model_unittest.cc index 0491ccd..382f224 100644 --- a/ash/launcher/launcher_model_unittest.cc +++ b/ash/launcher/launcher_model_unittest.cc @@ -8,7 +8,7 @@ #include <string> #include "ash/launcher/launcher_model_observer.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "testing/gtest/include/gtest/gtest.h" namespace ash { diff --git a/ash/launcher/launcher_tooltip_manager.h b/ash/launcher/launcher_tooltip_manager.h index b4cd20b..852c30cb 100644 --- a/ash/launcher/launcher_tooltip_manager.h +++ b/ash/launcher/launcher_tooltip_manager.h @@ -9,7 +9,7 @@ #include "ash/shelf/shelf_layout_manager_observer.h" #include "ash/shelf/shelf_types.h" #include "base/basictypes.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "ui/base/events/event_handler.h" #include "ui/gfx/rect.h" #include "ui/views/bubble/bubble_border.h" diff --git a/ash/launcher/launcher_tooltip_manager_unittest.cc b/ash/launcher/launcher_tooltip_manager_unittest.cc index 4ceef35..6a38d09 100644 --- a/ash/launcher/launcher_tooltip_manager_unittest.cc +++ b/ash/launcher/launcher_tooltip_manager_unittest.cc @@ -11,7 +11,7 @@ #include "ash/shell_window_ids.h" #include "ash/test/ash_test_base.h" #include "ash/wm/window_util.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/time.h" #include "ui/aura/root_window.h" #include "ui/base/events/event.h" |