diff options
Diffstat (limited to 'chrome/browser')
19 files changed, 69 insertions, 42 deletions
diff --git a/chrome/browser/bug_report_util.cc b/chrome/browser/bug_report_util.cc index 4560fbe..f00f85e 100644 --- a/chrome/browser/bug_report_util.cc +++ b/chrome/browser/bug_report_util.cc @@ -12,6 +12,7 @@ #include "base/file_version_info.h" #include "base/memory/singleton.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/win/windows_version.h" #include "chrome/browser/browser_process_impl.h" @@ -158,11 +159,13 @@ void BugReportUtil::SetOSVersion(std::string* os_version) { #if defined(OS_WIN) base::win::OSInfo* os_info = base::win::OSInfo::GetInstance(); base::win::OSInfo::VersionNumber version_number = os_info->version_number(); - *os_version = StringPrintf("%d.%d.%d", version_number.major, - version_number.minor, version_number.build); + *os_version = base::StringPrintf("%d.%d.%d", + version_number.major, + version_number.minor, + version_number.build); int service_pack = os_info->service_pack().major; if (service_pack > 0) - os_version->append(StringPrintf("Service Pack %d", service_pack)); + os_version->append(base::StringPrintf("Service Pack %d", service_pack)); #elif defined(OS_MACOSX) *os_version = base::SysInfo::OperatingSystemVersion(); #else diff --git a/chrome/browser/chromeos/input_method/input_method_manager.cc b/chrome/browser/chromeos/input_method/input_method_manager.cc index b31a529..e65b20c 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager.cc @@ -16,6 +16,7 @@ #include "base/process_util.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" @@ -841,8 +842,9 @@ class InputMethodManagerImpl : public InputMethodManager, // TODO(zork): Send output to /var/log/ibus.log const std::string ibus_daemon_command_line = - StringPrintf("%s --panel=disable --cache=none --restart --replace", - kIBusDaemonPath); + base::StringPrintf( + "%s --panel=disable --cache=none --restart --replace", + kIBusDaemonPath); if (!LaunchInputMethodProcess( ibus_daemon_command_line, &ibus_daemon_process_handle_)) { LOG(ERROR) << "Failed to launch " << ibus_daemon_command_line; diff --git a/chrome/browser/chromeos/input_method/xkeyboard.cc b/chrome/browser/chromeos/input_method/xkeyboard.cc index 31013d6..1c3627a 100644 --- a/chrome/browser/chromeos/input_method/xkeyboard.cc +++ b/chrome/browser/chromeos/input_method/xkeyboard.cc @@ -5,9 +5,9 @@ #include "chrome/browser/chromeos/input_method/xkeyboard.h" #include <queue> -#include <utility> #include <set> #include <string> +#include <utility> #include <X11/XKBlib.h> #include <X11/Xlib.h> @@ -15,11 +15,12 @@ #include <stdlib.h> #include <string.h> +#include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" -#include "base/logging.h" -#include "base/string_util.h" #include "base/process_util.h" +#include "base/string_util.h" +#include "base/stringprintf.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "content/browser/browser_thread.h" @@ -382,11 +383,13 @@ std::string CreateFullXkbLayoutName(const std::string& layout_name, } std::string full_xkb_layout_name = - StringPrintf("%s+chromeos(%s_%s_%s%s)", layout_name.c_str(), - use_search_key_as_str.c_str(), - use_left_control_key_as_str.c_str(), - use_left_alt_key_as_str.c_str(), - XkbLayoutSets::KeepRightAlt(layout_name) ? "_keepralt" : ""); + base::StringPrintf( + "%s+chromeos(%s_%s_%s%s)", + layout_name.c_str(), + use_search_key_as_str.c_str(), + use_left_control_key_as_str.c_str(), + use_left_alt_key_as_str.c_str(), + XkbLayoutSets::KeepRightAlt(layout_name) ? "_keepralt" : ""); if ((full_xkb_layout_name.substr(0, 3) != "us+") && (full_xkb_layout_name.substr(0, 3) != "us(")) { diff --git a/chrome/browser/chromeos/status/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc index 8132ca2..22f971e 100644 --- a/chrome/browser/chromeos/status/power_menu_button.cc +++ b/chrome/browser/chromeos/status/power_menu_button.cc @@ -7,6 +7,7 @@ #include <algorithm> #include "base/string_number_conversions.h" +#include "base/stringprintf.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" @@ -176,7 +177,7 @@ class PowerMenuButton::StatusView : public View { canvas->DrawBitmapInt(image, image_x, image_y); if (draw_percentage_text) { - string16 text = UTF8ToUTF16(StringPrintf( + string16 text = UTF8ToUTF16(base::StringPrintf( "%d%%", static_cast<int>(menu_button_->battery_percentage_))); int text_h = percentage_font_.GetHeight(); diff --git a/chrome/browser/chromeos/system/syslogs_provider.cc b/chrome/browser/chromeos/system/syslogs_provider.cc index 15b3283..271f42a 100644 --- a/chrome/browser/chromeos/system/syslogs_provider.cc +++ b/chrome/browser/chromeos/system/syslogs_provider.cc @@ -14,6 +14,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/memory_details.h" #include "chrome/common/chrome_switches.h" @@ -279,7 +280,8 @@ class SyslogsMemoryHandler : public MemoryDetails { std::string mem_string; for (ProcInfoSet::iterator iter = process_info.begin(); iter != process_info.end(); ++iter) { - mem_string += iter->second + StringPrintf(": %d MB", iter->first) + "\n"; + mem_string += + iter->second + base::StringPrintf(": %d MB", iter->first) + "\n"; } (*logs_)["mem_usage"] = mem_string; // This will call the callback on the calling thread. diff --git a/chrome/browser/chromeos/version_loader.cc b/chrome/browser/chromeos/version_loader.cc index 45b0a60..c0028e3 100644 --- a/chrome/browser/chromeos/version_loader.cc +++ b/chrome/browser/chromeos/version_loader.cc @@ -11,6 +11,7 @@ #include "base/message_loop.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/threading/thread.h" #include "base/time.h" #include "chrome/browser/browser_process.h" @@ -168,10 +169,10 @@ void VersionLoader::Backend::GetVersion( if (file_util::GetFileInfo(file_path, &fileinfo)) { base::Time::Exploded ctime; fileinfo.creation_time.UTCExplode(&ctime); - version += StringPrintf("-%02u.%02u.%02u", - ctime.year % 100, - ctime.month, - ctime.day_of_month); + version += base::StringPrintf("-%02u.%02u.%02u", + ctime.year % 100, + ctime.month, + ctime.day_of_month); } } diff --git a/chrome/browser/geolocation/wifi_data_provider_unittest_chromeos.cc b/chrome/browser/geolocation/wifi_data_provider_unittest_chromeos.cc index 4795bc8..1407449 100644 --- a/chrome/browser/geolocation/wifi_data_provider_unittest_chromeos.cc +++ b/chrome/browser/geolocation/wifi_data_provider_unittest_chromeos.cc @@ -1,7 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/mock_network_library.h" #include "chrome/browser/geolocation/wifi_data_provider_chromeos.h" @@ -26,10 +27,10 @@ class GeolocationChromeOsWifiDataProviderTest : public testing::Test { for (int i = 0; i < ssids; ++i) { for (int j = 0; j < aps_per_ssid; ++j) { WifiAccessPoint ap; - ap.name = StringPrintf("SSID %d", i); + ap.name = base::StringPrintf("SSID %d", i); ap.channel = i * 10 + j; - ap.mac_address = StringPrintf("%02X:%02X:%02X:%02X:%02X:%02X", - i, j, 3, 4, 5, 6); + ap.mac_address = base::StringPrintf("%02X:%02X:%02X:%02X:%02X:%02X", + i, j, 3, 4, 5, 6); ap.signal_strength = j; ap.signal_to_noise = i; ret.push_back(ap); diff --git a/chrome/browser/google/google_update.cc b/chrome/browser/google/google_update.cc index d5a4a76..aa571b9 100644 --- a/chrome/browser/google/google_update.cc +++ b/chrome/browser/google/google_update.cc @@ -11,6 +11,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/task.h" #include "base/threading/thread.h" #include "base/win/scoped_comptr.h" @@ -83,7 +84,8 @@ HRESULT CoCreateInstanceAsAdmin(REFCLSID class_id, REFIID interface_id, arraysize(class_id_as_string)); std::wstring elevation_moniker_name = - StringPrintf(L"Elevation:Administrator!new:%ls", class_id_as_string); + base::StringPrintf(L"Elevation:Administrator!new:%ls", + class_id_as_string); BIND_OPTS3 bind_opts; memset(&bind_opts, 0, sizeof(bind_opts)); diff --git a/chrome/browser/net/network_stats.cc b/chrome/browser/net/network_stats.cc index fc16084..5b394b1 100644 --- a/chrome/browser/net/network_stats.cc +++ b/chrome/browser/net/network_stats.cc @@ -9,6 +9,7 @@ #include "base/message_loop.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" +#include "base/stringprintf.h" #include "base/task.h" #include "base/threading/platform_thread.h" #include "base/time.h" diff --git a/chrome/browser/password_manager/ie7_password.cc b/chrome/browser/password_manager/ie7_password.cc index 576194b..ba15900 100644 --- a/chrome/browser/password_manager/ie7_password.cc +++ b/chrome/browser/password_manager/ie7_password.cc @@ -11,6 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/sha1.h" #include "base/string_util.h" +#include "base/stringprintf.h" namespace { @@ -100,9 +101,9 @@ std::wstring GetUrlHash(const std::wstring& url) { // check_sum. unsigned char hash_byte = static_cast<unsigned char>(hash_bin[i]); checksum += hash_byte; - url_hash += StringPrintf(L"%2.2X", static_cast<unsigned>(hash_byte)); + url_hash += base::StringPrintf(L"%2.2X", static_cast<unsigned>(hash_byte)); } - url_hash += StringPrintf(L"%2.2X", checksum); + url_hash += base::StringPrintf(L"%2.2X", checksum); return url_hash; } diff --git a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc index 7a91756..352aa92 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc @@ -7,6 +7,7 @@ #include "base/basictypes.h" #include "base/stl_util.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/native_backend_gnome_x.h" @@ -102,8 +103,9 @@ gpointer mock_gnome_keyring_store_password( mock_keyring_items.push_back( MockKeyringItem(keyring, display_name, password)); MockKeyringItem* item = &mock_keyring_items.back(); - const std::string keyring_desc = keyring ? StringPrintf("keyring %s", keyring) - : std::string("default keyring"); + const std::string keyring_desc = + keyring ? base::StringPrintf("keyring %s", keyring) + : std::string("default keyring"); VLOG(1) << "Adding item with origin " << display_name << " to " << keyring_desc; va_list ap; diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.cc b/chrome/browser/password_manager/native_backend_kwallet_x.cc index 064cb33..ffbd55b 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x.cc +++ b/chrome/browser/password_manager/native_backend_kwallet_x.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/pickle.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/stringprintf.h" #include "content/browser/browser_thread.h" #include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" @@ -650,7 +650,7 @@ int NativeBackendKWallet::WalletHandle() { std::string NativeBackendKWallet::GetProfileSpecificFolderName() const { // Originally, the folder name was always just "Chrome Form Data". // Now we use it to distinguish passwords for different profiles. - return StringPrintf("%s (%d)", kKWalletFolder, profile_id_); + return base::StringPrintf("%s (%d)", kKWalletFolder, profile_id_); } void NativeBackendKWallet::MigrateToProfileSpecificLogins() { diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index 4ab880b..bb09d4e 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/chrome/browser/password_manager/password_store_x_unittest.cc @@ -8,6 +8,7 @@ #include "base/scoped_temp_dir.h" #include "base/stl_util.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/synchronization/waitable_event.h" #include "base/time.h" #include "base/utf_string_conversions.h" @@ -245,9 +246,11 @@ class LoginDatabaseQueryTask : public Task { void InitExpectedForms(bool autofillable, size_t count, VectorOfForms* forms) { const char* domain = autofillable ? "example" : "blacklisted"; for (size_t i = 0; i < count; ++i) { - std::string realm = StringPrintf("http://%zu.%s.com", i, domain); - std::string origin = StringPrintf("http://%zu.%s.com/origin", i, domain); - std::string action = StringPrintf("http://%zu.%s.com/action", i, domain); + std::string realm = base::StringPrintf("http://%zu.%s.com", i, domain); + std::string origin = base::StringPrintf("http://%zu.%s.com/origin", + i, domain); + std::string action = base::StringPrintf("http://%zu.%s.com/action", + i, domain); PasswordFormData data = { PasswordForm::SCHEME_HTML, realm.c_str(), diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc index 56fa562..f432431 100644 --- a/chrome/browser/shell_integration_win.cc +++ b/chrome/browser/shell_integration_win.cc @@ -14,6 +14,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/task.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" @@ -216,7 +217,7 @@ bool MigrateChromiumShortcutsTask::GetExpectedAppId( return false; // Get expected app id from shortcut command line. - CommandLine command_line = CommandLine::FromString(StringPrintf( + CommandLine command_line = CommandLine::FromString(base::StringPrintf( L"\"%ls\" %ls", source.c_str(), arguments.c_str())); FilePath profile_path; diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc index 1787898..aceebc8 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc @@ -6,7 +6,7 @@ #include "base/pickle.h" #include "base/string16.h" -#include "base/string_util.h" +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" @@ -355,9 +355,9 @@ void WriteBookmarksToSelection(const std::vector<const BookmarkNode*>& nodes, } case ui::TEXT_HTML: { std::string utf8_title = UTF16ToUTF8(nodes[0]->GetTitle()); - std::string utf8_html = StringPrintf("<a href=\"%s\">%s</a>", - nodes[0]->url().spec().c_str(), - utf8_title.c_str()); + std::string utf8_html = base::StringPrintf("<a href=\"%s\">%s</a>", + nodes[0]->url().spec().c_str(), + utf8_title.c_str()); gtk_selection_data_set(selection_data, GetAtomForTarget(ui::TEXT_HTML), kBitsInAByte, diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc index a8a2793..ad5f469 100644 --- a/chrome/browser/ui/webui/flash_ui.cc +++ b/chrome/browser/ui/webui/flash_ui.cc @@ -6,6 +6,7 @@ #include "base/i18n/time_formatting.h" #include "base/string_number_conversions.h" +#include "base/stringprintf.h" #include "base/threading/thread_restrictions.h" #include "base/timer.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc index 58af269..d89566a 100644 --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc @@ -6,6 +6,7 @@ #include "base/callback.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc index f0b3ae4..b6e028e 100644 --- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc @@ -8,6 +8,7 @@ #include <set> #include <vector> +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/app/chrome_command_ids.h" @@ -198,7 +199,7 @@ void CrosLanguageOptionsHandler::RestartCallback(const ListValue* args) { void CrosLanguageOptionsHandler::InputMethodDisableCallback( const ListValue* args) { const std::string input_method_id = UTF16ToASCII(ExtractStringValue(args)); - const std::string action = StringPrintf( + const std::string action = base::StringPrintf( "LanguageOptions_DisableInputMethod_%s", input_method_id.c_str()); UserMetrics::RecordComputedAction(action); } @@ -206,7 +207,7 @@ void CrosLanguageOptionsHandler::InputMethodDisableCallback( void CrosLanguageOptionsHandler::InputMethodEnableCallback( const ListValue* args) { const std::string input_method_id = UTF16ToASCII(ExtractStringValue(args)); - const std::string action = StringPrintf( + const std::string action = base::StringPrintf( "LanguageOptions_EnableInputMethod_%s", input_method_id.c_str()); UserMetrics::RecordComputedAction(action); } @@ -214,7 +215,7 @@ void CrosLanguageOptionsHandler::InputMethodEnableCallback( void CrosLanguageOptionsHandler::InputMethodOptionsOpenCallback( const ListValue* args) { const std::string input_method_id = UTF16ToASCII(ExtractStringValue(args)); - const std::string action = StringPrintf( + const std::string action = base::StringPrintf( "InputMethodOptions_Open_%s", input_method_id.c_str()); UserMetrics::RecordComputedAction(action); } diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc index de29ab1..3a2fdb7 100644 --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc @@ -16,6 +16,7 @@ #include "base/i18n/time_formatting.h" #include "base/string16.h" #include "base/string_number_conversions.h" +#include "base/stringprintf.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" @@ -820,7 +821,7 @@ void InternetOptionsHandler::PopulateCellularDetails( dictionary->SetString("firmwareRevision", device->firmware_revision()); dictionary->SetString("hardwareRevision", device->hardware_revision()); dictionary->SetString("prlVersion", - StringPrintf("%u", device->prl_version())); + base::StringPrintf("%u", device->prl_version())); dictionary->SetString("meid", device->meid()); dictionary->SetString("imei", device->imei()); dictionary->SetString("mdn", device->mdn()); |