diff options
-rw-r--r-- | chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc | 2 | ||||
-rw-r--r-- | chrome/browser/ui/webui/chromeos/drive_internals_ui.cc | 4 | ||||
-rw-r--r-- | chromeos/audio/audio_device.cc | 2 | ||||
-rw-r--r-- | chromeos/dbus/audio_node.cc | 2 | ||||
-rw-r--r-- | chromeos/network/network_event_log_unittest.cc | 2 | ||||
-rw-r--r-- | chromeos/network/network_state_handler.cc | 10 | ||||
-rw-r--r-- | chromeos/network/shill_property_handler.cc | 6 | ||||
-rw-r--r-- | dbus/message.cc | 2 |
8 files changed, 15 insertions, 15 deletions
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc index 3baaa39..593fa26 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc @@ -1026,7 +1026,7 @@ bool GetMountPointsFunction::RunImpl() { log_string += "]"; - drive::util::Log("%s[%d] succeeded. (results: '%s', %"PRIuS" mount points)", + drive::util::Log("%s[%d] succeeded. (results: '%s', %" PRIuS " mount points)", name().c_str(), request_id(), log_string.c_str(), diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc index 498ecf7..ff0129c 100644 --- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc +++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc @@ -138,7 +138,7 @@ std::string FormatEntry(const base::FilePath& path, const drive::PlatformFileInfoProto& file_info = entry.file_info(); StringAppendF(&out, " file_info\n"); - StringAppendF(&out, " size: %"PRId64"\n", file_info.size()); + StringAppendF(&out, " size: %" PRId64 "\n", file_info.size()); StringAppendF(&out, " is_directory: %d\n", file_info.is_directory()); StringAppendF(&out, " is_symbolic_link: %d\n", file_info.is_symbolic_link()); @@ -177,7 +177,7 @@ std::string FormatEntry(const base::FilePath& path, StringAppendF(&out, " directory_info\n"); const drive::DirectorySpecificInfo& directory_specific_info = entry.directory_specific_info(); - StringAppendF(&out, " changestamp: %"PRId64"\n", + StringAppendF(&out, " changestamp: %" PRId64 "\n", directory_specific_info.changestamp()); } diff --git a/chromeos/audio/audio_device.cc b/chromeos/audio/audio_device.cc index 5e3aeb8..1448ec4 100644 --- a/chromeos/audio/audio_device.cc +++ b/chromeos/audio/audio_device.cc @@ -108,7 +108,7 @@ std::string AudioDevice::ToString() const { "is_input = %s ", is_input ? "true" : "false"); base::StringAppendF(&result, - "id = 0x%"PRIx64" ", + "id = 0x%" PRIx64 " ", id); base::StringAppendF(&result, "display_name = %s ", diff --git a/chromeos/dbus/audio_node.cc b/chromeos/dbus/audio_node.cc index 2f56701..e025e9d 100644 --- a/chromeos/dbus/audio_node.cc +++ b/chromeos/dbus/audio_node.cc @@ -39,7 +39,7 @@ std::string AudioNode::ToString() const { "is_input = %s ", is_input ? "true" : "false"); base::StringAppendF(&result, - "id = 0x%"PRIx64" ", + "id = 0x%" PRIx64 " ", id); base::StringAppendF(&result, "device_name = %s ", diff --git a/chromeos/network/network_event_log_unittest.cc b/chromeos/network/network_event_log_unittest.cc index e98f5a0..e98b32c 100644 --- a/chromeos/network/network_event_log_unittest.cc +++ b/chromeos/network/network_event_log_unittest.cc @@ -110,7 +110,7 @@ TEST_F(NetworkEventLogTest, TestMaxNetworkEvents) { for (size_t i = 0; i < entries_to_add; ++i) { network_event_log::internal::AddEntry( "test", 1, LOG_LEVEL_EVENT, - base::StringPrintf("event_%"PRIuS, i), ""); + base::StringPrintf("event_%" PRIuS, i), ""); } std::string output = GetLogString(OLDEST_FIRST, 0); size_t output_lines = CountLines(output); diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc index 60b0986..8d4c595 100644 --- a/chromeos/network/network_state_handler.cc +++ b/chromeos/network/network_state_handler.cc @@ -382,7 +382,7 @@ void NetworkStateHandler::UpdateManagedList(ManagedState::ManagedType type, const base::ListValue& entries) { ManagedStateList* managed_list = GetManagedList(type); NET_LOG_DEBUG(base::StringPrintf("UpdateManagedList:%d", type), - base::StringPrintf("%"PRIuS, entries.GetSize())); + base::StringPrintf("%" PRIuS, entries.GetSize())); // Create a map of existing entries. Assumes all entries in |managed_list| // are unique. std::map<std::string, ManagedState*> managed_map; @@ -552,7 +552,7 @@ void NetworkStateHandler::ManagedStateListChanged( if (type == ManagedState::MANAGED_TYPE_NETWORK) { // Notify observers that the list of networks has changed. NET_LOG_EVENT("NetworkListChanged", - base::StringPrintf("Size:%"PRIuS, network_list_.size())); + base::StringPrintf("Size:%" PRIuS, network_list_.size())); FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_, NetworkListChanged()); // The list order may have changed, so check if the default network changed. @@ -560,12 +560,12 @@ void NetworkStateHandler::ManagedStateListChanged( OnDefaultNetworkChanged(); } else if (type == ManagedState::MANAGED_TYPE_FAVORITE) { NET_LOG_DEBUG("FavoriteListChanged", - base::StringPrintf("Size:%"PRIuS, favorite_list_.size())); + base::StringPrintf("Size:%" PRIuS, favorite_list_.size())); FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_, NetworkListChanged()); } else if (type == ManagedState::MANAGED_TYPE_DEVICE) { NET_LOG_DEBUG("DeviceListChanged", - base::StringPrintf("Size:%"PRIuS, device_list_.size())); + base::StringPrintf("Size:%" PRIuS, device_list_.size())); FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_, DeviceListChanged()); } else { @@ -669,7 +669,7 @@ void NetworkStateHandler::NetworkPropertiesUpdated( void NetworkStateHandler::ScanCompleted(const std::string& type) { size_t num_callbacks = scan_complete_callbacks_.count(type); NET_LOG_EVENT("ScanCompleted", - base::StringPrintf("%s:%"PRIuS, type.c_str(), num_callbacks)); + base::StringPrintf("%s:%" PRIuS, type.c_str(), num_callbacks)); if (num_callbacks == 0) return; ScanCallbackList& callback_list = scan_complete_callbacks_[type]; diff --git a/chromeos/network/shill_property_handler.cc b/chromeos/network/shill_property_handler.cc index bc9c41d..0a7c3cd 100644 --- a/chromeos/network/shill_property_handler.cc +++ b/chromeos/network/shill_property_handler.cc @@ -419,7 +419,7 @@ void ShillPropertyHandler::UpdateAvailableTechnologies( const base::ListValue& technologies) { available_technologies_.clear(); NET_LOG_EVENT("AvailableTechnologiesChanged", - base::StringPrintf("Size: %"PRIuS, technologies.GetSize())); + base::StringPrintf("Size: %" PRIuS, technologies.GetSize())); for (base::ListValue::const_iterator iter = technologies.begin(); iter != technologies.end(); ++iter) { std::string technology; @@ -433,7 +433,7 @@ void ShillPropertyHandler::UpdateEnabledTechnologies( const base::ListValue& technologies) { enabled_technologies_.clear(); NET_LOG_EVENT("EnabledTechnologiesChanged", - base::StringPrintf("Size: %"PRIuS, technologies.GetSize())); + base::StringPrintf("Size: %" PRIuS, technologies.GetSize())); for (base::ListValue::const_iterator iter = technologies.begin(); iter != technologies.end(); ++iter) { std::string technology; @@ -448,7 +448,7 @@ void ShillPropertyHandler::UpdateUninitializedTechnologies( const base::ListValue& technologies) { uninitialized_technologies_.clear(); NET_LOG_EVENT("UninitializedTechnologiesChanged", - base::StringPrintf("Size: %"PRIuS, technologies.GetSize())); + base::StringPrintf("Size: %" PRIuS, technologies.GetSize())); for (base::ListValue::const_iterator iter = technologies.begin(); iter != technologies.end(); ++iter) { std::string technology; diff --git a/dbus/message.cc b/dbus/message.cc index e351716..b52528d 100644 --- a/dbus/message.cc +++ b/dbus/message.cc @@ -173,7 +173,7 @@ std::string Message::ToStringInternal(const std::string& indent, } else { std::string truncated; TruncateUTF8ToByteSize(value, kTruncateLength, &truncated); - base::StringAppendF(&truncated, "... (%"PRIuS" bytes in total)", + base::StringAppendF(&truncated, "... (%" PRIuS " bytes in total)", value.size()); output += indent + "string \"" + truncated + "\"\n"; } |