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

Unified Diff: chrome/browser/download/download_history.h

Issue 1542413002: Switch to standard integer types in chrome/browser/, part 1 of 4. (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
« no previous file with comments | « chrome/browser/download/download_file_picker.h ('k') | chrome/browser/download/download_history.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/download/download_history.h
diff --git a/chrome/browser/download/download_history.h b/chrome/browser/download/download_history.h
index 6b3c1cb00ce23c743afc25c56e0ea207eff152dd..eafb61b89c3660407f3e898acced59c640e70528 100644
--- a/chrome/browser/download/download_history.h
+++ b/chrome/browser/download/download_history.h
@@ -5,11 +5,13 @@
#ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_HISTORY_H_
#define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_HISTORY_H_
+#include <stdint.h>
+
#include <set>
#include <vector>
-#include "base/basictypes.h"
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "chrome/browser/download/all_download_item_notifier.h"
@@ -25,7 +27,7 @@ struct DownloadRow;
// DownloadDatabase up to date.
class DownloadHistory : public AllDownloadItemNotifier::Observer {
public:
- typedef std::set<uint32> IdSet;
+ typedef std::set<uint32_t> IdSet;
// Caller must guarantee that HistoryService outlives HistoryAdapter.
class HistoryAdapter {
@@ -42,7 +44,7 @@ class DownloadHistory : public AllDownloadItemNotifier::Observer {
virtual void UpdateDownload(const history::DownloadRow& data);
- virtual void RemoveDownloads(const std::set<uint32>& ids);
+ virtual void RemoveDownloads(const std::set<uint32_t>& ids);
private:
history::HistoryService* history_;
@@ -106,7 +108,7 @@ class DownloadHistory : public AllDownloadItemNotifier::Observer {
// Callback from |history_| when an item was successfully inserted into the
// database.
- void ItemAdded(uint32 id, bool success);
+ void ItemAdded(uint32_t id, bool success);
// AllDownloadItemNotifier::Observer
void OnDownloadCreated(content::DownloadManager* manager,
@@ -121,7 +123,7 @@ class DownloadHistory : public AllDownloadItemNotifier::Observer {
// Schedule a record to be removed from |history_| the next time
// RemoveDownloadsBatch() runs. Schedule RemoveDownloadsBatch() to be run soon
// if it isn't already scheduled.
- void ScheduleRemoveDownload(uint32 download_id);
+ void ScheduleRemoveDownload(uint32_t download_id);
// Removes all |removing_ids_| from |history_|.
void RemoveDownloadsBatch();
@@ -133,7 +135,7 @@ class DownloadHistory : public AllDownloadItemNotifier::Observer {
// Identifier of the item being created in QueryCallback(), matched up with
// created items in OnDownloadCreated() so that the item is not re-added to
// the database.
- uint32 loading_id_;
+ uint32_t loading_id_;
// Identifiers of items that are scheduled for removal from history, to
// facilitate batching removals together for database efficiency.
@@ -146,7 +148,7 @@ class DownloadHistory : public AllDownloadItemNotifier::Observer {
IdSet removed_while_adding_;
// Count the number of items in the history for UMA.
- int64 history_size_;
+ int64_t history_size_;
base::ObserverList<Observer> observers_;
« no previous file with comments | « chrome/browser/download/download_file_picker.h ('k') | chrome/browser/download/download_history.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698