| Index: chrome/browser/media_galleries/fileapi/media_file_system_backend.cc
|
| diff --git a/chrome/browser/media_galleries/fileapi/media_file_system_backend.cc b/chrome/browser/media_galleries/fileapi/media_file_system_backend.cc
|
| index aa4f27d904fe50779c11ad140ff271e1de0aebba..bb2ee6112b8ec1580d5cca99fc8e1b0ac1120b55 100644
|
| --- a/chrome/browser/media_galleries/fileapi/media_file_system_backend.cc
|
| +++ b/chrome/browser/media_galleries/fileapi/media_file_system_backend.cc
|
| @@ -16,6 +16,7 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/thread_task_runner_handle.h"
|
| #include "base/threading/sequenced_worker_pool.h"
|
| +#include "build/build_config.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/media_galleries/fileapi/device_media_async_file_util.h"
|
| @@ -72,8 +73,8 @@ void OnPreferencesInit(
|
| }
|
|
|
| void AttemptAutoMountOnUIThread(
|
| - int32 process_id,
|
| - int32 routing_id,
|
| + int32_t process_id,
|
| + int32_t routing_id,
|
| const std::string& storage_domain,
|
| const std::string& mount_point,
|
| const base::Callback<void(base::File::Error result)>& callback) {
|
| @@ -352,8 +353,8 @@ bool MediaFileSystemBackend::HasInplaceCopyImplementation(
|
| scoped_ptr<storage::FileStreamReader>
|
| MediaFileSystemBackend::CreateFileStreamReader(
|
| const FileSystemURL& url,
|
| - int64 offset,
|
| - int64 max_bytes_to_read,
|
| + int64_t offset,
|
| + int64_t max_bytes_to_read,
|
| const base::Time& expected_modification_time,
|
| FileSystemContext* context) const {
|
| if (url.type() == storage::kFileSystemTypeDeviceMedia) {
|
| @@ -376,7 +377,7 @@ MediaFileSystemBackend::CreateFileStreamReader(
|
| scoped_ptr<storage::FileStreamWriter>
|
| MediaFileSystemBackend::CreateFileStreamWriter(
|
| const FileSystemURL& url,
|
| - int64 offset,
|
| + int64_t offset,
|
| FileSystemContext* context) const {
|
| return scoped_ptr<storage::FileStreamWriter>(
|
| storage::FileStreamWriter::CreateForLocalFile(
|
|
|