| Index: content/browser/frame_host/navigation_controller_impl.h
|
| diff --git a/content/browser/frame_host/navigation_controller_impl.h b/content/browser/frame_host/navigation_controller_impl.h
|
| index 3a634a5a4cc7dffc32274b284ac1d98178160d9a..72b76d7464ab00d3071e2b6395b21032b32c3f01 100644
|
| --- a/content/browser/frame_host/navigation_controller_impl.h
|
| +++ b/content/browser/frame_host/navigation_controller_impl.h
|
| @@ -5,11 +5,15 @@
|
| #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_
|
| #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/gtest_prod_util.h"
|
| +#include "base/macros.h"
|
| #include "base/time/time.h"
|
| #include "build/build_config.h"
|
| #include "content/browser/frame_host/navigation_controller_delegate.h"
|
| @@ -73,8 +77,8 @@ class CONTENT_EXPORT NavigationControllerImpl
|
| const SessionStorageNamespaceMap& GetSessionStorageNamespaceMap()
|
| const override;
|
| SessionStorageNamespace* GetDefaultSessionStorageNamespace() override;
|
| - void SetMaxRestoredPageID(int32 max_id) override;
|
| - int32 GetMaxRestoredPageID() const override;
|
| + void SetMaxRestoredPageID(int32_t max_id) override;
|
| + int32_t GetMaxRestoredPageID() const override;
|
| bool NeedsReload() const override;
|
| void SetNeedsReload() override;
|
| void CancelPendingReload() override;
|
| @@ -109,17 +113,15 @@ class CONTENT_EXPORT NavigationControllerImpl
|
|
|
| // Return the index of the entry with the corresponding instance and page_id,
|
| // or -1 if not found.
|
| - int GetEntryIndexWithPageID(SiteInstance* instance,
|
| - int32 page_id) const;
|
| + int GetEntryIndexWithPageID(SiteInstance* instance, int32_t page_id) const;
|
|
|
| // Return the index of the entry with the given unique id, or -1 if not found.
|
| int GetEntryIndexWithUniqueID(int nav_entry_id) const;
|
|
|
| // Return the entry with the corresponding instance and page_id, or null if
|
| // not found.
|
| - NavigationEntryImpl* GetEntryWithPageID(
|
| - SiteInstance* instance,
|
| - int32 page_id) const;
|
| + NavigationEntryImpl* GetEntryWithPageID(SiteInstance* instance,
|
| + int32_t page_id) const;
|
|
|
| // Return the entry with the given unique id, or null if not found.
|
| NavigationEntryImpl* GetEntryWithUniqueID(int nav_entry_id) const;
|
| @@ -399,7 +401,7 @@ class CONTENT_EXPORT NavigationControllerImpl
|
| // The max restored page ID in this controller, if it was restored. We must
|
| // store this so that WebContentsImpl can tell any renderer in charge of one
|
| // of the restored entries to update its max page ID.
|
| - int32 max_restored_page_id_;
|
| + int32_t max_restored_page_id_;
|
|
|
| // Manages the SSL security UI.
|
| SSLManager ssl_manager_;
|
|
|