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

Unified Diff: chrome/browser/chromeos/drive/drive_file_stream_reader.h

Issue 1547093002: Switch to standard integer types in chrome/browser/chromeos/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: chrome/browser/chromeos/drive/drive_file_stream_reader.h
diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader.h b/chrome/browser/chromeos/drive/drive_file_stream_reader.h
index 0e15b1bf9b99155a9da5207404fa39ded7fdca92..0b4f8b1146fe03fc0d558c1eee6065a99184ed23 100644
--- a/chrome/browser/chromeos/drive/drive_file_stream_reader.h
+++ b/chrome/browser/chromeos/drive/drive_file_stream_reader.h
@@ -5,10 +5,12 @@
#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_STREAM_READER_H_
#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_STREAM_READER_H_
+#include <stdint.h>
+
#include <string>
-#include "base/basictypes.h"
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
@@ -58,8 +60,8 @@ class LocalReaderProxy : public ReaderProxy {
// This class takes its ownership.
// |length| is the number of bytes to be read. It must be equal or
// smaller than the remaining data size in the |file_reader|.
- LocalReaderProxy(
- scoped_ptr<util::LocalFileReader> file_reader, int64 length);
+ LocalReaderProxy(scoped_ptr<util::LocalFileReader> file_reader,
+ int64_t length);
~LocalReaderProxy() override;
// ReaderProxy overrides.
@@ -77,7 +79,7 @@ class LocalReaderProxy : public ReaderProxy {
const net::CompletionCallback& callback, int read_result);
// The number of remaining bytes to be read.
- int64 remaining_length_;
+ int64_t remaining_length_;
base::ThreadChecker thread_checker_;
@@ -94,9 +96,10 @@ class NetworkReaderProxy : public ReaderProxy {
// to cancel the job. |job_canceller| should be the callback to run the
// cancelling. |full_content_length| is necessary for determining whether the
// deletion is done in the middle of download process.
- NetworkReaderProxy(
- int64 offset, int64 content_length, int64 full_content_length,
- const base::Closure& job_canceller);
+ NetworkReaderProxy(int64_t offset,
+ int64_t content_length,
+ int64_t full_content_length,
+ const base::Closure& job_canceller);
~NetworkReaderProxy() override;
// ReaderProxy overrides.
@@ -111,11 +114,11 @@ class NetworkReaderProxy : public ReaderProxy {
ScopedVector<std::string> pending_data_;
// The number of bytes to be skipped.
- int64 remaining_offset_;
+ int64_t remaining_offset_;
// The number of bytes of remaining data (including the data not yet
// received from the server).
- int64 remaining_content_length_;
+ int64_t remaining_content_length_;
// Flag to remember whether this read request is for reading till the end of
// the file.
@@ -199,7 +202,7 @@ class DriveFileStreamReader {
// Part of Initialize. Called when the local file open process is done.
void InitializeAfterLocalFileOpen(
- int64 length,
+ int64_t length,
const InitializeCompletionCallback& callback,
scoped_ptr<ResourceEntry> entry,
scoped_ptr<util::LocalFileReader> file_reader,
« no previous file with comments | « chrome/browser/chromeos/drive/download_handler_unittest.cc ('k') | chrome/browser/chromeos/drive/drive_file_stream_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698