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 8a730da34a26b58aca69ae4945920c80f809bbe5..a646646f35f87d2fcf0577b33773260ca78cdca5 100644 |
--- a/content/browser/frame_host/navigation_controller_impl.h |
+++ b/content/browser/frame_host/navigation_controller_impl.h |
@@ -31,68 +31,63 @@ class CONTENT_EXPORT NavigationControllerImpl |
NavigationControllerImpl( |
NavigationControllerDelegate* delegate, |
BrowserContext* browser_context); |
- virtual ~NavigationControllerImpl(); |
+ ~NavigationControllerImpl() override; |
// NavigationController implementation: |
- virtual WebContents* GetWebContents() const override; |
- virtual BrowserContext* GetBrowserContext() const override; |
- virtual void SetBrowserContext( |
- BrowserContext* browser_context) override; |
- virtual void Restore( |
- int selected_navigation, |
- RestoreType type, |
- std::vector<NavigationEntry*>* entries) override; |
- virtual NavigationEntry* GetActiveEntry() const override; |
- virtual NavigationEntry* GetVisibleEntry() const override; |
- virtual int GetCurrentEntryIndex() const override; |
- virtual NavigationEntry* GetLastCommittedEntry() const override; |
- virtual int GetLastCommittedEntryIndex() const override; |
- virtual bool CanViewSource() const override; |
- virtual int GetEntryCount() const override; |
- virtual NavigationEntry* GetEntryAtIndex(int index) const override; |
- virtual NavigationEntry* GetEntryAtOffset(int offset) const override; |
- virtual void DiscardNonCommittedEntries() override; |
- virtual NavigationEntry* GetPendingEntry() const override; |
- virtual int GetPendingEntryIndex() const override; |
- virtual NavigationEntry* GetTransientEntry() const override; |
- virtual void SetTransientEntry(NavigationEntry* entry) override; |
- virtual void LoadURL(const GURL& url, |
- const Referrer& referrer, |
- ui::PageTransition type, |
- const std::string& extra_headers) override; |
- virtual void LoadURLWithParams(const LoadURLParams& params) override; |
- virtual void LoadIfNecessary() override; |
- virtual bool CanGoBack() const override; |
- virtual bool CanGoForward() const override; |
- virtual bool CanGoToOffset(int offset) const override; |
- virtual void GoBack() override; |
- virtual void GoForward() override; |
- virtual void GoToIndex(int index) override; |
- virtual void GoToOffset(int offset) override; |
- virtual bool RemoveEntryAtIndex(int index) override; |
- virtual const SessionStorageNamespaceMap& |
- GetSessionStorageNamespaceMap() const override; |
- virtual SessionStorageNamespace* |
- GetDefaultSessionStorageNamespace() override; |
- virtual void SetMaxRestoredPageID(int32 max_id) override; |
- virtual int32 GetMaxRestoredPageID() const override; |
- virtual bool NeedsReload() const override; |
- virtual void SetNeedsReload() override; |
- virtual void CancelPendingReload() override; |
- virtual void ContinuePendingReload() override; |
- virtual bool IsInitialNavigation() const override; |
- virtual void Reload(bool check_for_repost) override; |
- virtual void ReloadIgnoringCache(bool check_for_repost) override; |
- virtual void ReloadOriginalRequestURL(bool check_for_repost) override; |
- virtual void NotifyEntryChanged(const NavigationEntry* entry, |
- int index) override; |
- virtual void CopyStateFrom( |
- const NavigationController& source) override; |
- virtual void CopyStateFromAndPrune(NavigationController* source, |
- bool replace_entry) override; |
- virtual bool CanPruneAllButLastCommitted() override; |
- virtual void PruneAllButLastCommitted() override; |
- virtual void ClearAllScreenshots() override; |
+ WebContents* GetWebContents() const override; |
+ BrowserContext* GetBrowserContext() const override; |
+ void SetBrowserContext(BrowserContext* browser_context) override; |
+ void Restore(int selected_navigation, |
+ RestoreType type, |
+ std::vector<NavigationEntry*>* entries) override; |
+ NavigationEntry* GetActiveEntry() const override; |
+ NavigationEntry* GetVisibleEntry() const override; |
+ int GetCurrentEntryIndex() const override; |
+ NavigationEntry* GetLastCommittedEntry() const override; |
+ int GetLastCommittedEntryIndex() const override; |
+ bool CanViewSource() const override; |
+ int GetEntryCount() const override; |
+ NavigationEntry* GetEntryAtIndex(int index) const override; |
+ NavigationEntry* GetEntryAtOffset(int offset) const override; |
+ void DiscardNonCommittedEntries() override; |
+ NavigationEntry* GetPendingEntry() const override; |
+ int GetPendingEntryIndex() const override; |
+ NavigationEntry* GetTransientEntry() const override; |
+ void SetTransientEntry(NavigationEntry* entry) override; |
+ void LoadURL(const GURL& url, |
+ const Referrer& referrer, |
+ ui::PageTransition type, |
+ const std::string& extra_headers) override; |
+ void LoadURLWithParams(const LoadURLParams& params) override; |
+ void LoadIfNecessary() override; |
+ bool CanGoBack() const override; |
+ bool CanGoForward() const override; |
+ bool CanGoToOffset(int offset) const override; |
+ void GoBack() override; |
+ void GoForward() override; |
+ void GoToIndex(int index) override; |
+ void GoToOffset(int offset) override; |
+ bool RemoveEntryAtIndex(int index) override; |
+ const SessionStorageNamespaceMap& GetSessionStorageNamespaceMap() |
+ const override; |
+ SessionStorageNamespace* GetDefaultSessionStorageNamespace() override; |
+ void SetMaxRestoredPageID(int32 max_id) override; |
+ int32 GetMaxRestoredPageID() const override; |
+ bool NeedsReload() const override; |
+ void SetNeedsReload() override; |
+ void CancelPendingReload() override; |
+ void ContinuePendingReload() override; |
+ bool IsInitialNavigation() const override; |
+ void Reload(bool check_for_repost) override; |
+ void ReloadIgnoringCache(bool check_for_repost) override; |
+ void ReloadOriginalRequestURL(bool check_for_repost) override; |
+ void NotifyEntryChanged(const NavigationEntry* entry, int index) override; |
+ void CopyStateFrom(const NavigationController& source) override; |
+ void CopyStateFromAndPrune(NavigationController* source, |
+ bool replace_entry) override; |
+ bool CanPruneAllButLastCommitted() override; |
+ void PruneAllButLastCommitted() override; |
+ void ClearAllScreenshots() override; |
// Whether this is the initial navigation in an unmodified new tab. In this |
// case, we know there is no content displayed in the page. |