From 40d11e0a3b5e51d2bb4e7b4d0d5ceb8f5b82f9aa Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Thu, 28 Mar 2013 17:43:14 +0000 Subject: Update sys_string_conversions includes in chrome_frame, content, net, and ui. BUG= Review URL: https://codereview.chromium.org/13004021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191172 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/accessibility/browser_accessibility_cocoa.mm | 2 +- content/browser/download/download_manager_impl.cc | 2 +- content/browser/download/save_package.cc | 2 +- content/browser/geolocation/wifi_data_provider_corewlan_mac.mm | 2 +- content/browser/mach_broker_mac.cc | 2 +- content/browser/power_save_blocker_mac.cc | 2 +- content/browser/renderer_host/clipboard_message_filter_mac.mm | 2 +- content/browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm | 2 +- content/browser/renderer_host/render_message_filter.cc | 2 +- content/browser/renderer_host/render_widget_host_view_mac.mm | 4 ++-- content/browser/web_contents/web_drag_dest_mac.mm | 2 +- content/browser/web_contents/web_drag_dest_mac_unittest.mm | 2 +- content/browser/web_contents/web_drag_source_mac.mm | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) (limited to 'content/browser') diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm index e4d695a..95a2a84 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/string16.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "content/browser/accessibility/browser_accessibility_manager.h" #include "content/browser/accessibility/browser_accessibility_manager_mac.h" diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc index 6111b61..a02b7f8 100644 --- a/content/browser/download/download_manager_impl.cc +++ b/content/browser/download/download_manager_impl.cc @@ -14,9 +14,9 @@ #include "base/message_loop.h" #include "base/stl_util.h" #include "base/stringprintf.h" +#include "base/strings/sys_string_conversions.h" #include "base/supports_user_data.h" #include "base/synchronization/lock.h" -#include "base/sys_string_conversions.h" #include "build/build_config.h" #include "content/browser/byte_stream.h" #include "content/browser/download/download_create_info.h" diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc index c5171ee..cbff60a 100644 --- a/content/browser/download/save_package.cc +++ b/content/browser/download/save_package.cc @@ -15,7 +15,7 @@ #include "base/stl_util.h" #include "base/string_piece.h" #include "base/strings/string_split.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "content/browser/download/download_item_impl.h" diff --git a/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm b/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm index f552984..e9f3e26 100644 --- a/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm +++ b/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm @@ -12,7 +12,7 @@ #include "base/mac/scoped_nsautorelease_pool.h" #include "base/memory/scoped_nsobject.h" #include "base/metrics/histogram.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" // Define a subset of the CoreWLAN interfaces we require. We can't depend on // CoreWLAN.h existing as we need to build on 10.5 SDKs. We can't just send diff --git a/content/browser/mach_broker_mac.cc b/content/browser/mach_broker_mac.cc index 325db75..b255635 100644 --- a/content/browser/mach_broker_mac.cc +++ b/content/browser/mach_broker_mac.cc @@ -12,7 +12,7 @@ #include "base/mach_ipc_mac.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/threading/platform_thread.h" #include "content/browser/renderer_host/render_process_host_impl.h" #include "content/public/browser/child_process_data.h" diff --git a/content/browser/power_save_blocker_mac.cc b/content/browser/power_save_blocker_mac.cc index b5d47c0..113c4e9 100644 --- a/content/browser/power_save_blocker_mac.cc +++ b/content/browser/power_save_blocker_mac.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/lazy_instance.h" #include "base/mac/scoped_cftyperef.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" diff --git a/content/browser/renderer_host/clipboard_message_filter_mac.mm b/content/browser/renderer_host/clipboard_message_filter_mac.mm index 4105458..cdeabe6 100644 --- a/content/browser/renderer_host/clipboard_message_filter_mac.mm +++ b/content/browser/renderer_host/clipboard_message_filter_mac.mm @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "content/public/browser/browser_thread.h" #import "ui/base/cocoa/find_pasteboard.h" diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm b/content/browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm index 9b79e66..4507325 100644 --- a/content/browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm +++ b/content/browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm @@ -7,7 +7,7 @@ #import #include "base/mac/scoped_nsautorelease_pool.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" namespace content { diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index 8e2f45a..0d4e075 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -12,7 +12,7 @@ #include "base/debug/alias.h" #include "base/file_util.h" #include "base/process_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/threading/thread.h" #include "base/threading/worker_pool.h" #include "base/utf_string_conversions.h" diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm index e13bbdf..0a36a3d 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -16,10 +16,10 @@ #import "base/memory/scoped_nsobject.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" +#include "base/strings/sys_string_conversions.h" #include "base/sys_info.h" -#include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #import "content/browser/accessibility/browser_accessibility_cocoa.h" #include "content/browser/accessibility/browser_accessibility_manager_mac.h" diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm index a292e3b..7aa4369 100644 --- a/content/browser/web_contents/web_drag_dest_mac.mm +++ b/content/browser/web_contents/web_drag_dest_mac.mm @@ -6,7 +6,7 @@ #import -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/web_drag_dest_delegate.h" diff --git a/content/browser/web_contents/web_drag_dest_mac_unittest.mm b/content/browser/web_contents/web_drag_dest_mac_unittest.mm index 43fb8a3..204a2ae 100644 --- a/content/browser/web_contents/web_drag_dest_mac_unittest.mm +++ b/content/browser/web_contents/web_drag_dest_mac_unittest.mm @@ -4,7 +4,7 @@ #include "base/mac/scoped_nsautorelease_pool.h" #import "base/memory/scoped_nsobject.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "content/browser/renderer_host/test_render_view_host.h" #import "content/browser/web_contents/web_drag_dest_mac.h" diff --git a/content/browser/web_contents/web_drag_source_mac.mm b/content/browser/web_contents/web_drag_source_mac.mm index 83521f1..fd8390c 100644 --- a/content/browser/web_contents/web_drag_source_mac.mm +++ b/content/browser/web_contents/web_drag_source_mac.mm @@ -11,7 +11,7 @@ #include "base/mac/mac_util.h" #include "base/pickle.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" -- cgit v1.1