| Index: chrome/browser/prerender/prerender_manager.h
|
| diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h
|
| index e7a95e587a85f0c89f9aa6e2b1685525637ea072..ab02cfe4ad7c782cf96bb89e5a294e1f36ddb5a5 100644
|
| --- a/chrome/browser/prerender/prerender_manager.h
|
| +++ b/chrome/browser/prerender/prerender_manager.h
|
| @@ -5,10 +5,13 @@
|
| #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_
|
| #define CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <list>
|
| #include <string>
|
| #include <vector>
|
|
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "base/memory/weak_ptr.h"
|
| @@ -106,7 +109,7 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
|
| int process_id,
|
| int route_id,
|
| const GURL& url,
|
| - uint32 rel_types,
|
| + uint32_t rel_types,
|
| const content::Referrer& referrer,
|
| const gfx::Size& size);
|
|
|
| @@ -268,14 +271,14 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
|
|
|
| // Notification that a prerender has completed and its bytes should be
|
| // recorded.
|
| - void RecordNetworkBytes(Origin origin, bool used, int64 prerender_bytes);
|
| + void RecordNetworkBytes(Origin origin, bool used, int64_t prerender_bytes);
|
|
|
| // Returns whether prerendering is currently enabled for this manager.
|
| bool IsEnabled() const;
|
|
|
| // Add to the running tally of bytes transferred over the network for this
|
| // profile if prerendering is currently enabled.
|
| - void AddProfileNetworkBytesIfEnabled(int64 bytes);
|
| + void AddProfileNetworkBytesIfEnabled(int64_t bytes);
|
|
|
| // Registers a new ProcessHost performing a prerender. Called by
|
| // PrerenderContents.
|
| @@ -525,10 +528,10 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
|
|
|
| // The number of bytes transferred over the network for the profile this
|
| // PrerenderManager is attached to.
|
| - int64 profile_network_bytes_;
|
| + int64_t profile_network_bytes_;
|
|
|
| // The value of profile_network_bytes_ that was last recorded.
|
| - int64 last_recorded_profile_network_bytes_;
|
| + int64_t last_recorded_profile_network_bytes_;
|
|
|
| // Set of process hosts being prerendered.
|
| typedef std::set<content::RenderProcessHost*> PrerenderProcessSet;
|
|
|