Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(551)

Unified Diff: chromeos/audio/audio_device.h

Issue 1540803002: Switch to standard integer types in chromeos/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more includes Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/attestation/mock_attestation_flow.h ('k') | chromeos/audio/audio_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/audio/audio_device.h
diff --git a/chromeos/audio/audio_device.h b/chromeos/audio/audio_device.h
index 240f892b1d7859da9f5d9373e282a31e41da3f0e..ee47ee5e2be0b6d0c790fff388526bbc1e21b1ee 100644
--- a/chromeos/audio/audio_device.h
+++ b/chromeos/audio/audio_device.h
@@ -5,11 +5,12 @@
#ifndef CHROMEOS_AUDIO_AUDIO_DEVICE_H_
#define CHROMEOS_AUDIO_AUDIO_DEVICE_H_
+#include <stdint.h>
+
#include <map>
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "chromeos/chromeos_export.h"
#include "chromeos/dbus/audio_node.h"
@@ -56,18 +57,18 @@ struct CHROMEOS_EXPORT AudioDevice {
}
bool is_input;
- uint64 id;
+ uint64_t id;
std::string display_name;
std::string device_name;
std::string mic_positions;
AudioDeviceType type;
- uint8 priority;
+ uint8_t priority;
bool active;
- uint64 plugged_time;
+ uint64_t plugged_time;
};
typedef std::vector<AudioDevice> AudioDeviceList;
-typedef std::map<uint64, AudioDevice> AudioDeviceMap;
+typedef std::map<uint64_t, AudioDevice> AudioDeviceMap;
struct AudioDeviceCompare {
// Rules used to discern which device is higher,
« no previous file with comments | « chromeos/attestation/mock_attestation_flow.h ('k') | chromeos/audio/audio_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698