diff options
25 files changed, 36 insertions, 5 deletions
diff --git a/base/native_library_mac.mm b/base/native_library_mac.mm index 8aaeeb1..d13a4b6 100644 --- a/base/native_library_mac.mm +++ b/base/native_library_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,6 +11,7 @@ #include "base/file_util.h" #include "base/scoped_cftyperef.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" namespace base { diff --git a/base/string_util.h b/base/string_util.h index c69b2de..1b657ad 100644 --- a/base/string_util.h +++ b/base/string_util.h @@ -237,15 +237,22 @@ bool ContainsOnlyChars(const std::string& input, const std::string& characters); std::string WideToASCII(const std::wstring& wide); std::string UTF16ToASCII(const string16& utf16); +#ifdef RLZ_WIN_LIB_RLZ_LIB_H_ // Forward-declares for functions in utf_string_conversions.h. They used to -// be here and they were moved. We keep these here so the entire project -// doesn't need to be switched at once. -// TODO(brettw) delete these when everybody includes utf_string_conversions.h -// instead. +// be here and they were moved. We keep these here temporarily until all +// callers are converted. +// +// Currently, the only user is the RLZ project which needs to be updated +// asynchronously. It's needed in only one file, so we key off of the ifdef +// for that particular file to allow this case yet prevent other users from +// adding dependencies on this file. +// +// TODO(brettw) delete these when we fix RLZ to use the right header. std::wstring ASCIIToWide(const char* ascii); std::wstring ASCIIToWide(const std::string& ascii); string16 ASCIIToUTF16(const char* ascii); string16 ASCIIToUTF16(const std::string& ascii); +#endif // RLZ_WIN_LIB_RLZ_LIB_H_ // Converts the given wide string to the corresponding Latin1. This will fail // (return false) if any characters are more than 255. diff --git a/chrome/browser/autofill/autofill_address_model_mac_unittest.mm b/chrome/browser/autofill/autofill_address_model_mac_unittest.mm index ca517b0..adab6aa 100644 --- a/chrome/browser/autofill/autofill_address_model_mac_unittest.mm +++ b/chrome/browser/autofill/autofill_address_model_mac_unittest.mm @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/scoped_nsobject.h" +#include "base/utf_string_conversions.h" #import "chrome/browser/autofill/autofill_address_model_mac.h" #include "chrome/browser/autofill/autofill_common_unittest.h" #include "chrome/browser/autofill/autofill_profile.h" diff --git a/chrome/browser/autofill/autofill_address_sheet_controller_mac_unittest.mm b/chrome/browser/autofill/autofill_address_sheet_controller_mac_unittest.mm index f46425d..7c72255 100644 --- a/chrome/browser/autofill/autofill_address_sheet_controller_mac_unittest.mm +++ b/chrome/browser/autofill/autofill_address_sheet_controller_mac_unittest.mm @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/scoped_nsobject.h" +#include "base/utf_string_conversions.h" #import "chrome/browser/autofill/autofill_address_sheet_controller_mac.h" #include "chrome/browser/autofill/autofill_profile.h" #include "chrome/browser/cocoa/browser_test_helper.h" diff --git a/chrome/browser/autofill/autofill_credit_card_model_mac_unittest.mm b/chrome/browser/autofill/autofill_credit_card_model_mac_unittest.mm index 642741c..ad1083f 100644 --- a/chrome/browser/autofill/autofill_credit_card_model_mac_unittest.mm +++ b/chrome/browser/autofill/autofill_credit_card_model_mac_unittest.mm @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/scoped_nsobject.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_common_unittest.h" #import "chrome/browser/autofill/autofill_credit_card_model_mac.h" #include "chrome/browser/autofill/credit_card.h" diff --git a/chrome/browser/autofill/autofill_credit_card_sheet_controller_mac_unittest.mm b/chrome/browser/autofill/autofill_credit_card_sheet_controller_mac_unittest.mm index a15b421..9058070 100644 --- a/chrome/browser/autofill/autofill_credit_card_sheet_controller_mac_unittest.mm +++ b/chrome/browser/autofill/autofill_credit_card_sheet_controller_mac_unittest.mm @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/scoped_nsobject.h" +#include "base/utf_string_conversions.h" #import "chrome/browser/autofill/autofill_credit_card_sheet_controller_mac.h" #include "chrome/browser/autofill/credit_card.h" #include "chrome/browser/cocoa/browser_test_helper.h" diff --git a/chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm b/chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm index ac6833d..4509e68 100644 --- a/chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm +++ b/chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/ref_counted.h" +#include "base/utf_string_conversions.h" #import "chrome/browser/autofill/autofill_address_model_mac.h" #import "chrome/browser/autofill/autofill_address_sheet_controller_mac.h" #import "chrome/browser/autofill/autofill_credit_card_model_mac.h" diff --git a/chrome/browser/cocoa/browser_accessibility_unittest.mm b/chrome/browser/cocoa/browser_accessibility_unittest.mm index f147f74..104c26e 100644 --- a/chrome/browser/cocoa/browser_accessibility_unittest.mm +++ b/chrome/browser/cocoa/browser_accessibility_unittest.mm @@ -5,6 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/cocoa/browser_accessibility.h" #include "chrome/browser/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/cocoa/history_menu_bridge_unittest.mm index 456da45..e370fe8 100644 --- a/chrome/browser/cocoa/history_menu_bridge_unittest.mm +++ b/chrome/browser/cocoa/history_menu_bridge_unittest.mm @@ -8,6 +8,7 @@ #include "base/ref_counted_memory.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" +#include "base/utf_string_conversions.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser.h" #include "chrome/browser/cancelable_request.h" diff --git a/chrome/browser/cocoa/notifications/balloon_controller_unittest.mm b/chrome/browser/cocoa/notifications/balloon_controller_unittest.mm index b0137fb..ff1176e 100644 --- a/chrome/browser/cocoa/notifications/balloon_controller_unittest.mm +++ b/chrome/browser/cocoa/notifications/balloon_controller_unittest.mm @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/scoped_nsobject.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/cocoa/browser_test_helper.h" #include "chrome/browser/cocoa/cocoa_test_helper.h" #include "chrome/browser/cocoa/notifications/balloon_controller.h" diff --git a/chrome/browser/cocoa/page_info_window_mac_unittest.mm b/chrome/browser/cocoa/page_info_window_mac_unittest.mm index 2bbaf24..4091b44 100644 --- a/chrome/browser/cocoa/page_info_window_mac_unittest.mm +++ b/chrome/browser/cocoa/page_info_window_mac_unittest.mm @@ -7,6 +7,7 @@ #include "base/string_util.h" #include "base/string_number_conversions.h" #include "base/sys_string_conversions.h" +#include "base/utf_string_conversions.h" #import "chrome/browser/cocoa/page_info_window_mac.h" #import "chrome/browser/cocoa/page_info_window_controller.h" #include "chrome/browser/cocoa/browser_test_helper.h" diff --git a/chrome/browser/cocoa/ssl_client_certificate_selector.mm b/chrome/browser/cocoa/ssl_client_certificate_selector.mm index 48cb48a..9853996 100644 --- a/chrome/browser/cocoa/ssl_client_certificate_selector.mm +++ b/chrome/browser/cocoa/ssl_client_certificate_selector.mm @@ -15,6 +15,7 @@ #import "base/scoped_nsobject.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" +#include "base/utf_string_conversions.h" #import "chrome/browser/cocoa/constrained_window_mac.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/ssl/ssl_client_auth_handler.h" diff --git a/chrome/browser/cocoa/status_icons/status_icon_mac_unittest.mm b/chrome/browser/cocoa/status_icons/status_icon_mac_unittest.mm index fe15bca..39246ab 100644 --- a/chrome/browser/cocoa/status_icons/status_icon_mac_unittest.mm +++ b/chrome/browser/cocoa/status_icons/status_icon_mac_unittest.mm @@ -4,6 +4,7 @@ #include "app/resource_bundle.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #include "chrome/browser/cocoa/status_icons/status_icon_mac.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/cocoa/translate/translate_infobar_unittest.mm b/chrome/browser/cocoa/translate/translate_infobar_unittest.mm index 5ae1c15..2c8f767 100644 --- a/chrome/browser/cocoa/translate/translate_infobar_unittest.mm +++ b/chrome/browser/cocoa/translate/translate_infobar_unittest.mm @@ -6,6 +6,7 @@ #import "base/scoped_nsobject.h" #import "base/string_util.h" +#include "base/utf_string_conversions.h" #import "chrome/app/chrome_dll_resource.h" // For translate menu command ids. #import "chrome/browser/cocoa/browser_test_helper.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/dom_ui/advanced_options_handler.cc b/chrome/browser/dom_ui/advanced_options_handler.cc index d6ba66d..6672946 100644 --- a/chrome/browser/dom_ui/advanced_options_handler.cc +++ b/chrome/browser/dom_ui/advanced_options_handler.cc @@ -7,6 +7,7 @@ #include "app/l10n_util.h" #include "base/basictypes.h" #include "base/callback.h" +#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/dom_ui/options_managed_banner_handler.h" #include "chrome/browser/download/download_manager.h" diff --git a/chrome/browser/download/save_package_unittest.cc b/chrome/browser/download/save_package_unittest.cc index 1968e78..b921b63 100644 --- a/chrome/browser/download/save_package_unittest.cc +++ b/chrome/browser/download/save_package_unittest.cc @@ -7,6 +7,7 @@ #include "base/file_path.h" #include "base/path_service.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/download/save_package.h" #include "chrome/browser/net/url_request_mock_http_job.h" #include "chrome/browser/renderer_host/test/test_render_view_host.h" diff --git a/chrome/browser/remoting/remoting_resources_source.cc b/chrome/browser/remoting/remoting_resources_source.cc index f49e335..4c18089 100644 --- a/chrome/browser/remoting/remoting_resources_source.cc +++ b/chrome/browser/remoting/remoting_resources_source.cc @@ -7,6 +7,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/message_loop.h" +#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/google_util.h" diff --git a/chrome/browser/task_manager_unittest.cc b/chrome/browser/task_manager_unittest.cc index 0d27ba0..f1ca9a0 100644 --- a/chrome/browser/task_manager_unittest.cc +++ b/chrome/browser/task_manager_unittest.cc @@ -9,6 +9,7 @@ #include "app/l10n_util.h" #include "base/message_loop.h" #include "base/process_util.h" +#include "base/utf_string_conversions.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc index f8c0482..c22a57e 100644 --- a/chrome/installer/setup/uninstall.cc +++ b/chrome/installer/setup/uninstall.cc @@ -11,6 +11,7 @@ #include "base/registry.h" #include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "base/win_util.h" #include "chrome/common/result_codes.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/renderer/devtools_client.cc b/chrome/renderer/devtools_client.cc index 1c6aaaa..eea0b46 100644 --- a/chrome/renderer/devtools_client.cc +++ b/chrome/renderer/devtools_client.cc @@ -6,6 +6,7 @@ #include "app/app_switches.h" #include "base/command_line.h" +#include "base/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/devtools_messages.h" #include "chrome/common/render_messages.h" diff --git a/chrome/test/webdriver/server.cc b/chrome/test/webdriver/server.cc index 4b56ea7..cb72226 100644 --- a/chrome/test/webdriver/server.cc +++ b/chrome/test/webdriver/server.cc @@ -19,6 +19,7 @@ #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/test/webdriver/dispatch.h" #include "chrome/test/webdriver/session_manager.h" diff --git a/chrome/test/webdriver/session.cc b/chrome/test/webdriver/session.cc index 2aff00b..19c5a92 100644 --- a/chrome/test/webdriver/session.cc +++ b/chrome/test/webdriver/session.cc @@ -22,6 +22,7 @@ #include "base/string_util.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" +#include "base/utf_string_conversions.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/common/chrome_constants.h" diff --git a/net/base/cert_database_nss_unittest.cc b/net/base/cert_database_nss_unittest.cc index f25b043..7a1138b 100644 --- a/net/base/cert_database_nss_unittest.cc +++ b/net/base/cert_database_nss_unittest.cc @@ -12,6 +12,7 @@ #include "base/path_service.h" #include "base/scoped_temp_dir.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "net/base/cert_database.h" #include "net/base/net_errors.h" #include "net/base/x509_certificate.h" diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc index 1f85ff2..2324b0d 100644 --- a/net/http/http_proxy_client_socket_pool_unittest.cc +++ b/net/http/http_proxy_client_socket_pool_unittest.cc @@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/ssl_config_service_defaults.h" diff --git a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm index 766c8da..73d8f3c 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm +++ b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm @@ -16,6 +16,7 @@ #include "base/scoped_ptr.h" #include "base/stats_counters.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/plugins/plugin_instance.h" #include "webkit/glue/plugins/plugin_lib.h" |