summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos/extensions')
-rw-r--r--chrome/browser/chromeos/extensions/echo_private_api.cc2
-rw-r--r--chrome/browser/chromeos/extensions/file_manager/file_browser_handler.cc2
-rw-r--r--chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc2
-rw-r--r--chrome/browser/chromeos/extensions/file_manager/file_handler_util.cc4
-rw-r--r--chrome/browser/chromeos/extensions/file_manager/file_manager_notifications.h2
-rw-r--r--chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc2
-rw-r--r--chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc2
-rw-r--r--chrome/browser/chromeos/extensions/wallpaper_private_api.cc8
8 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/chromeos/extensions/echo_private_api.cc b/chrome/browser/chromeos/extensions/echo_private_api.cc
index 47dcd0b..5580cc2 100644
--- a/chrome/browser/chromeos/extensions/echo_private_api.cc
+++ b/chrome/browser/chromeos/extensions/echo_private_api.cc
@@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/file_util.h"
#include "base/location.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler.cc
index ded8dc5..715c0b6 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/chromeos/extensions/file_manager/file_browser_handler.h"
#include "base/logging.h"
-#include "base/string_util.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/common/extensions/extension_constants.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc
index 8295882..a4242a7 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc
@@ -17,8 +17,8 @@
#include "base/logging.h"
#include "base/memory/scoped_vector.h"
#include "base/posix/eintr_wrapper.h"
-#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/time.h"
#include "base/values.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_handler_util.cc b/chrome/browser/chromeos/extensions/file_manager/file_handler_util.cc
index fbd4229..6ccefe5 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_handler_util.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_handler_util.cc
@@ -8,8 +8,8 @@
#include "base/file_util.h"
#include "base/i18n/case_conversion.h"
#include "base/json/json_writer.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/chromeos/drive/file_system_util.h"
#include "chrome/browser/chromeos/drive/file_task_executor.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications.h b/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications.h
index a68ca8c..771ecaa 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications.h
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications.h
@@ -11,7 +11,7 @@
#include "base/basictypes.h"
#include "base/memory/weak_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "base/time.h"
class Profile;
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc
index 6be16a7..f75b313 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc
@@ -10,7 +10,7 @@
#include "base/logging.h"
#include "base/metrics/histogram.h"
#include "base/path_service.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/values.h"
diff --git a/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc b/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc
index a537428..8f0b432 100644
--- a/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc
+++ b/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/extensions/extension_apitest.h"
#include "base/command_line.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "chrome/browser/chromeos/extensions/input_method_event_router.h"
#include "chrome/browser/extensions/api/test/test_api.h"
#include "chrome/common/chrome_notification_types.h"
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
index d2a855e..6111c33 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
@@ -14,8 +14,8 @@
#include "base/json/json_writer.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
-#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
#include "base/synchronization/cancellation_flag.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/threading/worker_pool.h"
@@ -28,13 +28,13 @@
#include "chrome/browser/image_decoder.h"
#include "chrome/common/chrome_paths.h"
#include "content/public/browser/browser_thread.h"
-#include "net/url_request/url_fetcher.h"
-#include "net/url_request/url_fetcher_delegate.h"
-#include "net/url_request/url_request_status.h"
#include "googleurl/src/gurl.h"
#include "grit/app_locale_settings.h"
#include "grit/generated_resources.h"
#include "grit/platform_locale_settings.h"
+#include "net/url_request/url_fetcher.h"
+#include "net/url_request/url_fetcher_delegate.h"
+#include "net/url_request/url_request_status.h"
#include "ui/aura/window_observer.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/webui/web_ui_util.h"