Index: chrome/browser/chromeos/printer_detector/printer_detector.cc |
diff --git a/chrome/browser/chromeos/printer_detector/printer_detector.cc b/chrome/browser/chromeos/printer_detector/printer_detector.cc |
index e37f48eeec85eb498b81164a6474855ce540f127..f3652355362bcbeb631954a0d9ca4cddf2c60046 100644 |
--- a/chrome/browser/chromeos/printer_detector/printer_detector.cc |
+++ b/chrome/browser/chromeos/printer_detector/printer_detector.cc |
@@ -8,6 +8,7 @@ |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
+#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/metrics/histogram.h" |
#include "base/strings/string_number_conversions.h" |
@@ -53,7 +54,7 @@ const char kNoPrinterProviderNotificationID[] = |
// Base class used for printer USB interfaces |
// (https://www.usb.org/developers/defined_class). |
-const uint8 kPrinterInterfaceClass = 7; |
+const uint8_t kPrinterInterfaceClass = 7; |
enum PrinterServiceEvent { |
PRINTER_ADDED, |
@@ -64,7 +65,7 @@ enum PrinterServiceEvent { |
PRINTER_SERVICE_EVENT_MAX, |
}; |
-base::string16 GetNotificationTitle(uint16 vendor_id, uint16 product_id) { |
+base::string16 GetNotificationTitle(uint16_t vendor_id, uint16_t product_id) { |
const char* vendor_name = device::UsbIds::GetVendorName(vendor_id); |
if (vendor_name) { |
return l10n_util::GetStringFUTF16(IDS_PRINTER_DETECTED_NOTIFICATION_TITLE, |
@@ -142,9 +143,9 @@ class PrinterProviderExistsNotificationDelegate : public NotificationDelegate { |
class SearchPrinterAppNotificationDelegate : public NotificationDelegate { |
public: |
SearchPrinterAppNotificationDelegate(content::BrowserContext* browser_context, |
- uint16 vendor_id, |
+ uint16_t vendor_id, |
const std::string& vendor_id_str, |
- uint16 product_id, |
+ uint16_t product_id, |
const std::string& product_id_str) |
: browser_context_(browser_context), |
vendor_id_(vendor_id), |
@@ -182,9 +183,9 @@ class SearchPrinterAppNotificationDelegate : public NotificationDelegate { |
~SearchPrinterAppNotificationDelegate() override = default; |
content::BrowserContext* browser_context_; |
- uint16 vendor_id_; |
+ uint16_t vendor_id_; |
std::string vendor_id_str_; |
- uint16 product_id_; |
+ uint16_t product_id_; |
std::string product_id_str_; |
DISALLOW_COPY_AND_ASSIGN(SearchPrinterAppNotificationDelegate); |