| Index: chrome/utility/media_galleries/ipc_data_source.h
|
| diff --git a/chrome/utility/media_galleries/ipc_data_source.h b/chrome/utility/media_galleries/ipc_data_source.h
|
| index dda9364be6924870583be1262fb0dd5ede2bb5cf..ff00484c94a3d08a141d318044402bab0801abc1 100644
|
| --- a/chrome/utility/media_galleries/ipc_data_source.h
|
| +++ b/chrome/utility/media_galleries/ipc_data_source.h
|
| @@ -5,6 +5,8 @@
|
| #ifndef CHROME_UTILITY_MEDIA_GALLERIES_IPC_DATA_SOURCE_H_
|
| #define CHROME_UTILITY_MEDIA_GALLERIES_IPC_DATA_SOURCE_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <map>
|
| #include <string>
|
|
|
| @@ -27,17 +29,17 @@ class IPCDataSource: public media::DataSource,
|
| public UtilityMessageHandler {
|
| public:
|
| // May only be called on the utility thread.
|
| - explicit IPCDataSource(int64 total_size);
|
| + explicit IPCDataSource(int64_t total_size);
|
| ~IPCDataSource() override;
|
|
|
| // Implementation of DataSource. These methods may be called on any single
|
| // thread. First usage of these methods attaches a thread checker.
|
| void Stop() override;
|
| - void Read(int64 position,
|
| + void Read(int64_t position,
|
| int size,
|
| - uint8* data,
|
| + uint8_t* data,
|
| const ReadCB& read_cb) override;
|
| - bool GetSize(int64* size_out) override;
|
| + bool GetSize(int64_t* size_out) override;
|
| bool IsStreaming() override;
|
| void SetBitrate(int bitrate) override;
|
|
|
| @@ -49,21 +51,22 @@ class IPCDataSource: public media::DataSource,
|
| struct Request {
|
| Request();
|
| ~Request();
|
| - uint8* destination;
|
| + uint8_t* destination;
|
| ReadCB callback;
|
| };
|
|
|
| - void ReadOnUtilityThread(int64 position, int size, uint8* data,
|
| + void ReadOnUtilityThread(int64_t position,
|
| + int size,
|
| + uint8_t* data,
|
| const ReadCB& read_cb);
|
|
|
| - void OnRequestBlobBytesFinished(int64 request_id,
|
| - const std::string& bytes);
|
| + void OnRequestBlobBytesFinished(int64_t request_id, const std::string& bytes);
|
|
|
| - const int64 total_size_;
|
| + const int64_t total_size_;
|
|
|
| scoped_refptr<base::TaskRunner> utility_task_runner_;
|
| - std::map<int64, Request> pending_requests_;
|
| - int64 next_request_id_;
|
| + std::map<int64_t, Request> pending_requests_;
|
| + int64_t next_request_id_;
|
|
|
| base::ThreadChecker utility_thread_checker_;
|
|
|
|
|