summaryrefslogtreecommitdiffstats
path: root/ui/app_list
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 12:31:09 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 12:31:09 +0000
commitb576ef11641e55c019976425b53d6394b6153b1e (patch)
tree2a0c14edc149f08e39d23bc37034d7f6bd38ef9c /ui/app_list
parenta9877420d54853dc3c8b45fc944f2f76ac917dde (diff)
downloadchromium_src-b576ef11641e55c019976425b53d6394b6153b1e.zip
chromium_src-b576ef11641e55c019976425b53d6394b6153b1e.tar.gz
chromium_src-b576ef11641e55c019976425b53d6394b6153b1e.tar.bz2
Use a direct include of strings headers in ui/, part 1.
BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16402012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/app_list')
-rw-r--r--ui/app_list/app_list_view_delegate.h2
-rw-r--r--ui/app_list/cocoa/test/apps_grid_controller_test_helper.mm2
-rw-r--r--ui/app_list/pagination_model_unittest.cc2
-rw-r--r--ui/app_list/search_box_model.h2
-rw-r--r--ui/app_list/search_result.h2
-rw-r--r--ui/app_list/signin_delegate.h2
-rw-r--r--ui/app_list/test/app_list_test_model.cc2
-rw-r--r--ui/app_list/views/app_list_main_view.cc2
-rw-r--r--ui/app_list/views/app_list_view.cc2
9 files changed, 9 insertions, 9 deletions
diff --git a/ui/app_list/app_list_view_delegate.h b/ui/app_list/app_list_view_delegate.h
index a857d28..d675447 100644
--- a/ui/app_list/app_list_view_delegate.h
+++ b/ui/app_list/app_list_view_delegate.h
@@ -5,7 +5,7 @@
#ifndef UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
#define UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "ui/app_list/app_list_export.h"
namespace gfx {
diff --git a/ui/app_list/cocoa/test/apps_grid_controller_test_helper.mm b/ui/app_list/cocoa/test/apps_grid_controller_test_helper.mm
index 9023c5f..5ea919b 100644
--- a/ui/app_list/cocoa/test/apps_grid_controller_test_helper.mm
+++ b/ui/app_list/cocoa/test/apps_grid_controller_test_helper.mm
@@ -5,7 +5,7 @@
#import "ui/app_list/cocoa/test/apps_grid_controller_test_helper.h"
#include "base/mac/foundation_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "ui/app_list/app_list_item_model.h"
#import "ui/app_list/cocoa/apps_grid_controller.h"
#import "ui/app_list/cocoa/apps_grid_view_item.h"
diff --git a/ui/app_list/pagination_model_unittest.cc b/ui/app_list/pagination_model_unittest.cc
index a292203..d855f69 100644
--- a/ui/app_list/pagination_model_unittest.cc
+++ b/ui/app_list/pagination_model_unittest.cc
@@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/message_loop.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/app_list/pagination_model_observer.h"
diff --git a/ui/app_list/search_box_model.h b/ui/app_list/search_box_model.h
index 1df1429..77beda8 100644
--- a/ui/app_list/search_box_model.h
+++ b/ui/app_list/search_box_model.h
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/observer_list.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "ui/app_list/app_list_export.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/selection_model.h"
diff --git a/ui/app_list/search_result.h b/ui/app_list/search_result.h
index d41cc80..ae3e76e 100644
--- a/ui/app_list/search_result.h
+++ b/ui/app_list/search_result.h
@@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/observer_list.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "ui/app_list/app_list_export.h"
#include "ui/base/models/list_model.h"
#include "ui/base/range/range.h"
diff --git a/ui/app_list/signin_delegate.h b/ui/app_list/signin_delegate.h
index fb7f802..fe2b94b 100644
--- a/ui/app_list/signin_delegate.h
+++ b/ui/app_list/signin_delegate.h
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/observer_list.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "ui/app_list/app_list_export.h"
namespace app_list {
diff --git a/ui/app_list/test/app_list_test_model.cc b/ui/app_list/test/app_list_test_model.cc
index 9086fe9..67331f3 100644
--- a/ui/app_list/test/app_list_test_model.cc
+++ b/ui/app_list/test/app_list_test_model.cc
@@ -4,7 +4,7 @@
#include "ui/app_list/test/app_list_test_model.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "ui/app_list/app_list_item_model.h"
namespace app_list {
diff --git a/ui/app_list/views/app_list_main_view.cc b/ui/app_list/views/app_list_main_view.cc
index be53492..206fa9f 100644
--- a/ui/app_list/views/app_list_main_view.cc
+++ b/ui/app_list/views/app_list_main_view.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "ui/app_list/app_list_constants.h"
#include "ui/app_list/app_list_item_model.h"
#include "ui/app_list/app_list_model.h"
diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc
index c61eb4c..c256cac 100644
--- a/ui/app_list/views/app_list_view.cc
+++ b/ui/app_list/views/app_list_view.cc
@@ -4,7 +4,7 @@
#include "ui/app_list/views/app_list_view.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "ui/app_list/app_list_constants.h"
#include "ui/app_list/app_list_model.h"
#include "ui/app_list/app_list_view_delegate.h"