diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-28 17:41:43 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-28 17:41:43 +0000 |
| commit | 3268d7b7ca8b096476cc070a036b337ddcc561a9 (patch) | |
| tree | 7dbb199789ef07f39e421a0065f0def994495045 /chrome/browser/ui | |
| parent | 6cdad9aa82615d357ce7ca595f17e74418cc7ee3 (diff) | |
| download | chromium_src-3268d7b7ca8b096476cc070a036b337ddcc561a9.zip chromium_src-3268d7b7ca8b096476cc070a036b337ddcc561a9.tar.gz chromium_src-3268d7b7ca8b096476cc070a036b337ddcc561a9.tar.bz2 | |
Rename sys_string_conversions in chrome.
This moves includes from using base/sys_string_conversions.h to the new location in base/strings/sys_string_conversions.h
BUG=196305
Review URL: https://codereview.chromium.org/13042020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191171 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
124 files changed, 124 insertions, 124 deletions
diff --git a/chrome/browser/ui/cocoa/about_ipc_controller.mm b/chrome/browser/ui/cocoa/about_ipc_controller.mm index 35d3fbd..4b1f5fa 100644 --- a/chrome/browser/ui/cocoa/about_ipc_controller.mm +++ b/chrome/browser/ui/cocoa/about_ipc_controller.mm @@ -6,7 +6,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/time.h" #import "chrome/browser/ui/cocoa/about_ipc_controller.h" #include "content/public/browser/browser_ipc_logging.h" diff --git a/chrome/browser/ui/cocoa/applescript/apple_event_util.mm b/chrome/browser/ui/cocoa/applescript/apple_event_util.mm index f250654..2a4c1e9 100644 --- a/chrome/browser/ui/cocoa/applescript/apple_event_util.mm +++ b/chrome/browser/ui/cocoa/applescript/apple_event_util.mm @@ -7,7 +7,7 @@ #import <Carbon/Carbon.h> #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/values.h" namespace chrome { diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm index b300153..1814e0f 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm @@ -6,7 +6,7 @@ #import "base/memory/scoped_nsobject.h" #import "base/string16.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.h" #import "chrome/browser/ui/cocoa/applescript/constants_applescript.h" diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm index 5e264bf..0bbd0b4 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/memory/scoped_nsobject.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.h" diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.mm b/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.mm index a548ee2..3518440 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/profiles/profile_manager.h" #import "chrome/browser/ui/cocoa/applescript/error_applescript.h" diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript_unittest.mm b/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript_unittest.mm index 51f079c..44a309f 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript_unittest.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/memory/scoped_nsobject.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.h" #import "chrome/browser/ui/cocoa/applescript/error_applescript.h" diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm b/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm index e0830b1..52a2136 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm @@ -6,7 +6,7 @@ #include "base/logging.h" #import "base/memory/scoped_nsobject.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm index 7bf0063..0219701 100644 --- a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm @@ -8,7 +8,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #import "base/memory/scoped_nsobject.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/printing/print_view_manager.h" #include "chrome/browser/sessions/session_id.h" #include "chrome/browser/sessions/session_tab_helper.h" diff --git a/chrome/browser/ui/cocoa/applescript/window_applescript_test.mm b/chrome/browser/ui/cocoa/applescript/window_applescript_test.mm index 144b9b4..f13b03b 100644 --- a/chrome/browser/ui/cocoa/applescript/window_applescript_test.mm +++ b/chrome/browser/ui/cocoa/applescript/window_applescript_test.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #import "base/memory/scoped_nsobject.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/app_controller_mac.h" #import "chrome/browser/chrome_browser_application_mac.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm index 282a940..f606db0 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm @@ -6,7 +6,7 @@ #include "base/i18n/rtl.h" #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/ui/autofill/autofill_popup_controller.h" #include "chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h" #include "grit/ui_resources.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm index 3982b60..e1806bd 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h" #include "base/string16.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm index eb72d5c..be1ea13 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "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 "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index 8b2f049..17b4ab3 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -8,7 +8,7 @@ #include "base/mac/mac_util.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm index e5a2fa6..b613bd6 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm @@ -9,7 +9,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/string16.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm index f8d8c2f..94095ac 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm @@ -6,7 +6,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm index e12e5cb..7268bea 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm @@ -6,7 +6,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm index 49633f0..6aaab33 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h" #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/bookmarks/bookmark_model.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm index 95ee57b..4520a4c 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm @@ -12,7 +12,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/message_loop.h" #include "base/string16.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm index 5702472..b643474 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm index 5f640a0..782412e 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "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 "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm index 46226e7..169bc9e 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm @@ -6,7 +6,7 @@ #include "base/prefs/pref_service.h" #include "base/string16.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_expanded_state_tracker.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/net/url_fixer_upper.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm index bf27272..95fe47c 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.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 "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.mm index 30530c2..78d5042 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h" #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm index eb4bb58..5697035 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm @@ -4,7 +4,7 @@ #import <AppKit/AppKit.h> -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm index 01bdc6c..1c71391 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" // IDC_BOOKMARK_MENU #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm index ba9fc5c..b19a3ca 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm @@ -6,7 +6,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/profiles/profile.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_cell_single_line.h" diff --git a/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm b/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm index 32b8e41..dcdbaa2 100644 --- a/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm +++ b/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/command_updater.h" diff --git a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm index 85b0ec4..338e398 100644 --- a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm @@ -6,7 +6,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/avatar_menu_model.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm index 5d2d2a6..7b3bab8 100644 --- a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm @@ -8,7 +8,7 @@ #include "base/mac/bundle_locations.h" #import "base/mac/mac_util.h" #include "base/string16.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/search_engines/template_url.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm b/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm index 9eca804..47917de 100644 --- a/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.h" #include "base/mac/foundation_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller_unittest.mm index 2f60f39..c904074 100644 --- a/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller_unittest.mm @@ -8,7 +8,7 @@ #include "base/metrics/histogram.h" #include "base/metrics/histogram_samples.h" #include "base/metrics/statistics_recorder.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #include "components/autofill/browser/password_generator.h" #include "content/public/common/password_form.h" diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index b427fc0..84285c8 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -10,7 +10,7 @@ #include "base/mac/mac_util.h" #include "base/message_loop.h" #include "base/prefs/pref_service.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/download/download_shelf.h" #include "chrome/browser/extensions/tab_helper.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index d34267a..c1d4e74 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -11,7 +11,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.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 "chrome/app/chrome_command_ids.h" // IDC_* #include "chrome/browser/bookmarks/bookmark_editor.h" diff --git a/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.mm b/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.mm index b221e77..a5716ae 100644 --- a/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.mm @@ -6,7 +6,7 @@ #include "base/mac/mac_util.h" #include "base/memory/weak_ptr.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/chrome_to_mobile_service_factory.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" diff --git a/chrome/browser/ui/cocoa/confirm_bubble_controller.mm b/chrome/browser/ui/cocoa/confirm_bubble_controller.mm index 4e45d10..9eb0c68 100644 --- a/chrome/browser/ui/cocoa/confirm_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/confirm_bubble_controller.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/confirm_bubble_controller.h" #include "base/mac/mac_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/confirm_bubble_cocoa.h" #import "chrome/browser/ui/confirm_bubble_model.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm index bd8f350..659fff8 100644 --- a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm +++ b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm @@ -11,7 +11,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_registry_simple.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm index 9f17f2c..bbafe4e 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm @@ -10,7 +10,7 @@ #import "base/mac/mac_util.h" #include "base/message_loop.h" #include "base/prefs/pref_service.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" #include "chrome/browser/browsing_data/browsing_data_database_helper.h" diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm index e36af43..fa699e3 100644 --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/stl_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/plugins/plugin_finder.h" diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details.mm index fff4350..1922d30 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_details.mm +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details.mm @@ -5,7 +5,7 @@ #include "chrome/browser/ui/cocoa/content_settings/cookie_details.h" #import "base/i18n/time_formatting.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/browsing_data/cookies_tree_model.h" #include "grit/generated_resources.h" #include "net/cookies/canonical_cookie.h" diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm index e54976c..8854459 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/content_settings/cookie_details.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm index 45ec3ea..b62e1b4 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm @@ -6,7 +6,7 @@ #include "base/mac/bundle_locations.h" #import "base/mac/mac_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm index 0a3aae7..29a0806 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/content_settings/cookie_details.h" #include "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.h" diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_tree_node.mm b/chrome/browser/ui/cocoa/content_settings/cookie_tree_node.mm index 92aad45..a459194 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_tree_node.mm +++ b/chrome/browser/ui/cocoa/content_settings/cookie_tree_node.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" @implementation CocoaCookieTreeNode diff --git a/chrome/browser/ui/cocoa/download/download_item_button.mm b/chrome/browser/ui/cocoa/download/download_item_button.mm index 9ed650c..67920fe 100644 --- a/chrome/browser/ui/cocoa/download/download_item_button.mm +++ b/chrome/browser/ui/cocoa/download/download_item_button.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/download/download_item_button.h" #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/download/download_item_cell.h" #import "chrome/browser/ui/cocoa/download/download_item_controller.h" diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.mm b/chrome/browser/ui/cocoa/download/download_item_cell.mm index ee31de2..2a47782 100644 --- a/chrome/browser/ui/cocoa/download/download_item_cell.mm +++ b/chrome/browser/ui/cocoa/download/download_item_cell.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/download/download_item_cell.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_util.h" #import "chrome/browser/themes/theme_properties.h" diff --git a/chrome/browser/ui/cocoa/download/download_item_controller.mm b/chrome/browser/ui/cocoa/download/download_item_controller.mm index 2553d4c..4e9d747 100644 --- a/chrome/browser/ui/cocoa/download/download_item_controller.mm +++ b/chrome/browser/ui/cocoa/download/download_item_controller.mm @@ -9,7 +9,7 @@ #include "base/metrics/histogram.h" #include "base/string16.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/download/chrome_download_manager_delegate.h" #include "chrome/browser/download/download_item_model.h" diff --git a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm index 16ea814..ff89d1a 100644 --- a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm +++ b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm @@ -6,7 +6,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h" diff --git a/chrome/browser/ui/cocoa/download/download_util_mac.mm b/chrome/browser/ui/cocoa/download/download_util_mac.mm index 585e624..6f737aa 100644 --- a/chrome/browser/ui/cocoa/download/download_util_mac.mm +++ b/chrome/browser/ui/cocoa/download/download_util_mac.mm @@ -7,7 +7,7 @@ #include "chrome/browser/ui/cocoa/download/download_util_mac.h" #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm b/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm index f2cc313..78ac5e6 100644 --- a/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm @@ -6,7 +6,7 @@ #include "base/files/file_path.h" #include "base/path_service.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/download/download_util_mac.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.mm b/chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.mm index fabc392..839385c 100644 --- a/chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.mm +++ b/chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.mm @@ -7,7 +7,7 @@ #import <Cocoa/Cocoa.h> #include "base/string16.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm index a877064..484cecd 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm @@ -8,7 +8,7 @@ #include <cmath> #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_icon_factory.h" #include "chrome/browser/extensions/extension_action_manager.h" diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm b/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm index c52156a..4a0c51b 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm @@ -5,7 +5,7 @@ #include "chrome/browser/extensions/browser_action_test_util.h" #include "base/mac/foundation_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/ui/browser.h" #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm index 2014688..5626ac7 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm @@ -8,7 +8,7 @@ #include <string> #include "base/prefs/pref_service.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm index a013567..72b3420 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm @@ -6,7 +6,7 @@ #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm index 095a1f0..5035cb3c 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm @@ -9,7 +9,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/bundle_installer.h" #import "chrome/browser/ui/chrome_style.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm index 2361310..d2cfad8 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.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" #import "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm index ebed37e..483665b 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm @@ -7,7 +7,7 @@ #include "base/i18n/rtl.h" #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/api/commands/command_service.h" #include "chrome/browser/extensions/bundle_installer.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm b/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm index fd15aea..0bcbb32 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm @@ -8,7 +8,7 @@ #include <string> -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/common/extensions/extension.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm index 46a8223..b1325d0 100644 --- a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm @@ -4,7 +4,7 @@ #include "chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h" #import "chrome/browser/ui/cocoa/key_equivalent_constants.h" diff --git a/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm b/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm index 8ec9971..fcd4a15 100644 --- a/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm @@ -5,7 +5,7 @@ #include "chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h" #include "base/mac/mac_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/cocoa/browser_window_utils.h" #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" diff --git a/chrome/browser/ui/cocoa/external_protocol_dialog.mm b/chrome/browser/ui/cocoa/external_protocol_dialog.mm index e4e713c..5570997 100644 --- a/chrome/browser/ui/cocoa/external_protocol_dialog.mm +++ b/chrome/browser/ui/cocoa/external_protocol_dialog.mm @@ -7,7 +7,7 @@ #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/external_protocol/external_protocol_handler.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.mm index aaf5ad0..1e0e184 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" // static diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm index ab01ce0..7fccc7a 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm @@ -7,7 +7,7 @@ #include "base/auto_reset.h" #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm index 1b39246..8c24d25 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm index 46642a7..b3fd521 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/first_run_dialog.mm b/chrome/browser/ui/cocoa/first_run_dialog.mm index 289adab..9168a55 100644 --- a/chrome/browser/ui/cocoa/first_run_dialog.mm +++ b/chrome/browser/ui/cocoa/first_run_dialog.mm @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #import "base/memory/scoped_nsobject.h" #include "base/message_loop.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/first_run/first_run_dialog.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm index 95c89a1..20269fc 100644 --- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm @@ -7,7 +7,7 @@ #include "base/logging.h" // for NOTREACHED() #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm index 4b9082c..a7d125b 100644 --- a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/global_error_bubble_controller.h" #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/search_engines/util.h" #import "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm index 2af915b..2f5705d 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm @@ -9,7 +9,7 @@ #include "base/stl_util.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" // IDC_HISTORY_MENU #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/favicon/favicon_service_factory.h" diff --git a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm index c0a2646..37dd487 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm @@ -8,7 +8,7 @@ #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/common/cancelable_request.h" diff --git a/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm index a1bec72..b1fa620 100644 --- a/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm @@ -5,7 +5,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #include "chrome/browser/ui/cocoa/history_menu_bridge.h" diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm index 202c8a7..0837b8b 100644 --- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm +++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm @@ -9,7 +9,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/process_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/ui/browser_dialogs.h" #import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h" diff --git a/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.mm b/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.mm index d6cc7e2..681487d 100644 --- a/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.mm @@ -9,7 +9,7 @@ #include "base/mac/mac_util.h" #include "base/message_loop.h" #import "base/memory/scoped_nsobject.h" -#import "base/sys_string_conversions.h" +#import "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/importer/importer_host.h" #include "chrome/browser/importer/importer_observer.h" diff --git a/chrome/browser/ui/cocoa/infobars/after_translate_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/after_translate_infobar_controller.mm index 2074fd54..3bcfda0 100644 --- a/chrome/browser/ui/cocoa/infobars/after_translate_infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/after_translate_infobar_controller.mm @@ -4,7 +4,7 @@ #include "chrome/browser/ui/cocoa/infobars/after_translate_infobar_controller.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/infobars/infobar_utilities.h" using InfoBarUtilities::MoveControl; diff --git a/chrome/browser/ui/cocoa/infobars/alternate_nav_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/alternate_nav_infobar_controller.mm index f676206..f4200d5 100644 --- a/chrome/browser/ui/cocoa/infobars/alternate_nav_infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/alternate_nav_infobar_controller.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/infobars/alternate_nav_infobar_controller.h" #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/ui/cocoa/event_utils.h" #import "chrome/browser/ui/cocoa/hyperlink_text_view.h" #include "chrome/browser/ui/cocoa/infobars/infobar.h" diff --git a/chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.mm index 8ba37a1..369d0f5 100644 --- a/chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.mm @@ -4,7 +4,7 @@ #include "chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/infobars/infobar_utilities.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.mm index 363ec59..a9a843a 100644 --- a/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.mm @@ -5,7 +5,7 @@ #include "chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.h" #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" #include "chrome/browser/ui/cocoa/event_utils.h" #import "chrome/browser/ui/cocoa/hyperlink_text_view.h" diff --git a/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm b/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm index bb66555..b53f21f 100644 --- a/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm @@ -6,7 +6,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" diff --git a/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm b/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm index bdc67bf..25ea9c7 100644 --- a/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm +++ b/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/infobars/translate_infobar_base.h" #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #import "chrome/browser/ui/cocoa/hover_close_button.h" diff --git a/chrome/browser/ui/cocoa/infobars/translate_message_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/translate_message_infobar_controller.mm index 1f82998..d210d21 100644 --- a/chrome/browser/ui/cocoa/infobars/translate_message_infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/translate_message_infobar_controller.mm @@ -4,7 +4,7 @@ #include "chrome/browser/ui/cocoa/infobars/translate_message_infobar_controller.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/infobars/infobar_utilities.h" using InfoBarUtilities::MoveControl; diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm index 05a99a3..f92de8c 100644 --- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm @@ -7,7 +7,7 @@ #import <Cocoa/Cocoa.h> #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/chrome_browser_application_mac.h" #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/cocoa/l10n_util.mm b/chrome/browser/ui/cocoa/l10n_util.mm index 5ebb8c7..87fb16f 100644 --- a/chrome/browser/ui/cocoa/l10n_util.mm +++ b/chrome/browser/ui/cocoa/l10n_util.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/l10n_util.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" namespace cocoa_l10n_util { diff --git a/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.mm b/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.mm index 11170c9..db8ebc9 100644 --- a/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.mm @@ -7,7 +7,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" #include "base/mac/mac_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/extensions/extension_icon_image.h" #import "chrome/browser/ui/cocoa/browser_window_utils.h" #import "chrome/browser/ui/cocoa/event_utils.h" diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm index 400747e2..78d128c 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" // IDC_* #include "chrome/browser/ui/browser_list.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm index dc60b32..9ff7f19 100644 --- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm @@ -7,7 +7,7 @@ #include <algorithm> #include "base/prefs/pref_service.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.mm b/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.mm index 923c3ec..0c94d6c 100644 --- a/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h" #import "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h" #include "ui/base/text/text_elider.h" #include "ui/gfx/font.h" diff --git a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm index 140f782..c6a0076 100644 --- a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "grit/theme_resources.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_mac.h" diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 11a65d2..779a9b5 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -10,7 +10,7 @@ #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/app_controller_mac.h" diff --git a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm index 12f0e55..eeaf783 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm index 001622d..6dc394f8 100644 --- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm @@ -6,7 +6,7 @@ #import "chrome/browser/ui/cocoa/location_bar/page_action_decoration.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_tab_util.h" diff --git a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm index 90b2487..30cdc1a 100644 --- a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" #include "chrome/browser/ui/omnibox/location_bar_util.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/cocoa/login_prompt_cocoa.mm b/chrome/browser/ui/cocoa/login_prompt_cocoa.mm index a53808c..1cf6ba4 100644 --- a/chrome/browser/ui/cocoa/login_prompt_cocoa.mm +++ b/chrome/browser/ui/cocoa/login_prompt_cocoa.mm @@ -9,7 +9,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/string16.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/tab_contents/tab_util.h" diff --git a/chrome/browser/ui/cocoa/menu_controller.mm b/chrome/browser/ui/cocoa/menu_controller.mm index 886d31a..7bb0270 100644 --- a/chrome/browser/ui/cocoa/menu_controller.mm +++ b/chrome/browser/ui/cocoa/menu_controller.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/menu_controller.h" #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/event_utils.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/platform_accelerator_cocoa.h" diff --git a/chrome/browser/ui/cocoa/menu_controller_unittest.mm b/chrome/browser/ui/cocoa/menu_controller_unittest.mm index 4636cdb..c5846f4 100644 --- a/chrome/browser/ui/cocoa/menu_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/menu_controller_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/message_loop.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/menu_controller.h" diff --git a/chrome/browser/ui/cocoa/nsmenuitem_additions_unittest.mm b/chrome/browser/ui/cocoa/nsmenuitem_additions_unittest.mm index f9d7412..90185bb 100644 --- a/chrome/browser/ui/cocoa/nsmenuitem_additions_unittest.mm +++ b/chrome/browser/ui/cocoa/nsmenuitem_additions_unittest.mm @@ -9,7 +9,7 @@ #include <ostream> #include "base/memory/scoped_nsobject.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" NSEvent* KeyEvent(const NSUInteger modifierFlags, diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm index 0244c3d..41ca93f 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm @@ -7,7 +7,7 @@ #include <cmath> #include "base/stl_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/search/search.h" #include "chrome/browser/ui/cocoa/event_utils.h" diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm index 84d66ad..c5db89e 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h" #include "base/memory/scoped_ptr.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "testing/platform_test.h" #include "ui/base/text/text_elider.h" diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm index 7c43e06..751ef89 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm @@ -8,7 +8,7 @@ #include "base/mac/foundation_util.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/autocomplete/autocomplete_match.h" diff --git a/chrome/browser/ui/cocoa/panels/panel_cocoa_unittest.mm b/chrome/browser/ui/cocoa/panels/panel_cocoa_unittest.mm index a04135f..b0eda33 100644 --- a/chrome/browser/ui/cocoa/panels/panel_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/panels/panel_cocoa_unittest.mm @@ -9,7 +9,7 @@ #include "base/debug/debugger.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/memory/scoped_ptr.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" // IDC_* #import "chrome/browser/ui/cocoa/browser_window_utils.h" #import "chrome/browser/ui/cocoa/cocoa_profile_test.h" diff --git a/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm b/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm index 9f982e4..dd7ec1e 100644 --- a/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm +++ b/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm @@ -11,7 +11,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_nsautorelease_pool.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" // IDC_* #include "chrome/browser/chrome_browser_application_mac.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/cocoa/profile_menu_controller.mm b/chrome/browser/ui/cocoa/profile_menu_controller.mm index 24ac819..1e7d5bf 100644 --- a/chrome/browser/ui/cocoa/profile_menu_controller.mm +++ b/chrome/browser/ui/cocoa/profile_menu_controller.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/profile_menu_controller.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/avatar_menu_model.h" #include "chrome/browser/profiles/avatar_menu_model_observer.h" diff --git a/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa.mm b/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa.mm index 158a23d..eeb098f2 100644 --- a/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa.mm +++ b/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa.mm @@ -10,7 +10,7 @@ #include "base/i18n/rtl.h" #include "base/mac/bundle_locations.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/simple_message_box_mac.mm b/chrome/browser/ui/cocoa/simple_message_box_mac.mm index 49f4803..a81d106 100644 --- a/chrome/browser/ui/cocoa/simple_message_box_mac.mm +++ b/chrome/browser/ui/cocoa/simple_message_box_mac.mm @@ -6,7 +6,7 @@ #import <Cocoa/Cocoa.h> -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/common/startup_metric_utils.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/cocoa/speech_recognition_window_controller.mm b/chrome/browser/ui/cocoa/speech_recognition_window_controller.mm index 8a75dad..6a0969e 100644 --- a/chrome/browser/ui/cocoa/speech_recognition_window_controller.mm +++ b/chrome/browser/ui/cocoa/speech_recognition_window_controller.mm @@ -5,7 +5,7 @@ #import "speech_recognition_window_controller.h" #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/ui/cocoa/info_bubble_view.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm index ea0856e..8c3abb9 100644 --- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm +++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/mac/foundation_util.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ssl/ssl_client_auth_observer.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.mm b/chrome/browser/ui/cocoa/status_bubble_mac.mm index 69d865d..206f5bb 100644 --- a/chrome/browser/ui/cocoa/status_bubble_mac.mm +++ b/chrome/browser/ui/cocoa/status_bubble_mac.mm @@ -11,7 +11,7 @@ #include "base/mac/mac_util.h" #include "base/message_loop.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/bubble_view.h" #include "net/base/net_util.h" diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm index a6cf5e9..efef25f 100644 --- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm +++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm @@ -7,7 +7,7 @@ #import <AppKit/AppKit.h> #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/menu_controller.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm b/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm index 9bdcb99..d846f8a 100644 --- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/status_icons/status_icon_mac.h" diff --git a/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm b/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm index 67e01c9..92300ce 100644 --- a/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm +++ b/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm @@ -8,7 +8,7 @@ #import "base/mac/scoped_sending_event.h" #include "base/memory/scoped_nsobject.h" #include "base/message_loop.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/menu_controller.h" diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm index 288702d..0662eb8 100644 --- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm +++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm @@ -5,7 +5,7 @@ #include "chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h" #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h" #import "chrome/browser/ui/cocoa/hyperlink_text_view.h" #include "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h" diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm index c9a9318..c2e5b6d 100644 --- a/chrome/browser/ui/cocoa/tabpose_window.mm +++ b/chrome/browser/ui/cocoa/tabpose_window.mm @@ -12,7 +12,7 @@ #include "base/mac/scoped_cftyperef.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_service.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/devtools/devtools_window.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index 45cbb96..31fd9b2 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -15,7 +15,7 @@ #include "base/mac/scoped_nsautorelease_pool.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm index 93e4234..bf8e04d 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac.mm +++ b/chrome/browser/ui/cocoa/task_manager_mac.mm @@ -10,7 +10,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/prefs/pref_service.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/browser/browser_process.h" #import "chrome/browser/ui/cocoa/window_size_autosaver.h" #include "chrome/browser/ui/host_desktop.h" diff --git a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm index e7f5696..23a3b87 100644 --- a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/event_utils.h" #import "chrome/browser/ui/cocoa/menu_button.h" #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index 58b04e3..2563721 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -11,7 +11,7 @@ #include "base/memory/singleton.h" #include "base/prefs/pref_service.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" diff --git a/chrome/browser/ui/cocoa/ui_localizer.mm b/chrome/browser/ui/cocoa/ui_localizer.mm index 32f65d8..273f3f4 100644 --- a/chrome/browser/ui/cocoa/ui_localizer.mm +++ b/chrome/browser/ui/cocoa/ui_localizer.mm @@ -9,7 +9,7 @@ #include <stdlib.h> #include "base/logging.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/ui_strings.h" diff --git a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm index eee1c68..9797deb 100644 --- a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm +++ b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/memory/scoped_nsobject.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/browser_dialogs.h" #import "chrome/browser/ui/cocoa/browser_command_executor.h" #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" diff --git a/chrome/browser/ui/cocoa/web_dialog_window_controller_unittest.mm b/chrome/browser/ui/cocoa/web_dialog_window_controller_unittest.mm index 5d9322e..c7fd5eb 100644 --- a/chrome/browser/ui/cocoa/web_dialog_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/web_dialog_window_controller_unittest.mm @@ -10,7 +10,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/scoped_nsautorelease_pool.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm index d94bd5d..735f8b9 100644 --- a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm @@ -9,7 +9,7 @@ #import <AppKit/AppKit.h> #include "base/strings/string_number_conversions.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #import "chrome/browser/certificate_viewer.h" #include "chrome/browser/infobars/infobar_service.h" #import "chrome/browser/ui/browser_dialogs.h" diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm index 5b57b58..5cb4874 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm @@ -8,7 +8,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/string16.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm index 80759c6..6c16807 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "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 "chrome/app/chrome_command_ids.h" #include "chrome/browser/search/search.h" diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc index 66557b2..c1a5070 100644 --- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc +++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc @@ -17,7 +17,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.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" diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index fbec838..bba0147 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -15,7 +15,7 @@ #include "base/metrics/histogram.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/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/chrome_download_manager_delegate.h" diff --git a/chrome/browser/ui/webui/options/font_settings_utils_mac.mm b/chrome/browser/ui/webui/options/font_settings_utils_mac.mm index aadef16..6dae847 100644 --- a/chrome/browser/ui/webui/options/font_settings_utils_mac.mm +++ b/chrome/browser/ui/webui/options/font_settings_utils_mac.mm @@ -8,7 +8,7 @@ #include "base/mac/scoped_nsautorelease_pool.h" #include "base/prefs/pref_service.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "base/values.h" #include "chrome/common/pref_names.h" |