Switch to standard integer types in chrome/browser/chromeos/.

chrome/browser/chromeos/printer_detector/printer_detector.cc

 // Copyright 2015 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 "chrome/browser/chromeos/printer_detector/printer_detector.h"
 
 #include <stdint.h>
 
 #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"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_delegate.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/common/extensions/api/webstore_widget_private.h"
@@ skipping 25 matching lines @@
 namespace {
 
 const char kPrinterProviderFoundNotificationID[] =
     "chrome://settings/printer/printer_app_found";
 
 const char kNoPrinterProviderNotificationID[] =
     "chrome://settings/printer/no_printer_app";
 
 // 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,
   DEPRECATED_PAGE_DISPLAYED,
   NOTIFICATION_SHOWN_PRINTER_SUPPORTED,
   NOTIFICATION_SHOWN_PRINTER_NOT_SUPPORTED,
   WEBSTORE_WIDGET_APP_LAUNCHED,
   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,
                                       base::UTF8ToUTF16(vendor_name));
   } else {
     return l10n_util::GetStringUTF16(
         IDS_PRINTER_DETECTED_NOTIFICATION_TITLE_UNKNOWN_VENDOR);
   }
 }
 
@@ skipping 57 matching lines @@
 };
 
 // Delegate for notification shown when there are no printer provider apps that
 // support the plugged in printer found.
 // The notification is clickable, and clicking it is supposed to launch
 // Chrome Web Store widget listing apps that can support the plugged in printer.
 // (not implemented yet).
 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),
         vendor_id_str_(vendor_id_str),
         product_id_(product_id),
         product_id_str_(product_id_str) {}
 
   std::string id() const override {
     return "system.printer.no_printer_provider_found/" +
            GetNotificationTag(vendor_id_str_, product_id_str_);
@@ skipping 17 matching lines @@
         webstore_widget_private_api::OnShowWidget::kEventName,
         webstore_widget_private_api::OnShowWidget::Create(options)));
     event_router->DispatchEventToExtension(extension_misc::kWebstoreWidgetAppId,
                                            event.Pass());
   }
 
  private:
   ~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);
 };
 
 // Shows a notification for a plugged in printer.
 // If there is a printerProvider app that handles the printer's USB (vendor_id,
 // product_id) pair, the notification informs the user that the printer is ready
 // to be used, otherwise it offers the user to search the Chrome Web Store for
 // an app that can handle the printer.
@@ skipping 100 matching lines @@
                                : g_browser_process->notification_ui_manager(),
       device);
 }
 
 void PrinterDetector::SetNotificationUIManagerForTesting(
     NotificationUIManager* manager) {
   notification_ui_manager_ = manager;
 }
 
 }  // namespace chromeos