content/browser/web_contents/navigation_controller_impl.h - Issue 19699007: Ensure we don't crash if user navigates back from NTP to Chrome sign-in page before it has fully lo…

Side by Side Diff: content/browser/web_contents/navigation_controller_impl.h

Issue 19699007: Ensure we don't crash if user navigates back from NTP to Chrome sign-in page before it has fully lo… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add test coverage for removing a pending entry. Created 7 years, 5 months 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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/signin/signin_browsertest.cc ('K') | « chrome/browser/ui/sync/one_click_signin_helper.cc ('k') | content/browser/web_contents/navigation_controller_impl.cc » ('j') | content/public/browser/navigation_controller.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_	5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_

6 #define CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_	6 #define CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_

7	7

8 #include "base/callback.h"	8 #include "base/callback.h"

9 #include "base/compiler_specific.h"	9 #include "base/compiler_specific.h"

10 #include "base/gtest_prod_util.h"	10 #include "base/gtest_prod_util.h"

(...skipping 51 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
62 const std::string& extra_headers) OVERRIDE;	62 const std::string& extra_headers) OVERRIDE;

63 virtual void LoadURLWithParams(const LoadURLParams& params) OVERRIDE;	63 virtual void LoadURLWithParams(const LoadURLParams& params) OVERRIDE;

64 virtual void LoadIfNecessary() OVERRIDE;	64 virtual void LoadIfNecessary() OVERRIDE;

65 virtual bool CanGoBack() const OVERRIDE;	65 virtual bool CanGoBack() const OVERRIDE;

66 virtual bool CanGoForward() const OVERRIDE;	66 virtual bool CanGoForward() const OVERRIDE;

67 virtual bool CanGoToOffset(int offset) const OVERRIDE;	67 virtual bool CanGoToOffset(int offset) const OVERRIDE;

68 virtual void GoBack() OVERRIDE;	68 virtual void GoBack() OVERRIDE;

69 virtual void GoForward() OVERRIDE;	69 virtual void GoForward() OVERRIDE;

70 virtual void GoToIndex(int index) OVERRIDE;	70 virtual void GoToIndex(int index) OVERRIDE;

71 virtual void GoToOffset(int offset) OVERRIDE;	71 virtual void GoToOffset(int offset) OVERRIDE;

72 virtual void RemoveEntryAtIndex(int index) OVERRIDE;	72 virtual bool RemoveEntryAtIndex(int index) OVERRIDE;

73 virtual SessionStorageNamespace* GetSessionStorageNamespace() OVERRIDE;	73 virtual SessionStorageNamespace* GetSessionStorageNamespace() OVERRIDE;

74 virtual void SetMaxRestoredPageID(int32 max_id) OVERRIDE;	74 virtual void SetMaxRestoredPageID(int32 max_id) OVERRIDE;

75 virtual int32 GetMaxRestoredPageID() const OVERRIDE;	75 virtual int32 GetMaxRestoredPageID() const OVERRIDE;

76 virtual bool NeedsReload() const OVERRIDE;	76 virtual bool NeedsReload() const OVERRIDE;

77 virtual void CancelPendingReload() OVERRIDE;	77 virtual void CancelPendingReload() OVERRIDE;

78 virtual void ContinuePendingReload() OVERRIDE;	78 virtual void ContinuePendingReload() OVERRIDE;

79 virtual bool IsInitialNavigation() const OVERRIDE;	79 virtual bool IsInitialNavigation() const OVERRIDE;

80 virtual void Reload(bool check_for_repost) OVERRIDE;	80 virtual void Reload(bool check_for_repost) OVERRIDE;

81 virtual void ReloadIgnoringCache(bool check_for_repost) OVERRIDE;	81 virtual void ReloadIgnoringCache(bool check_for_repost) OVERRIDE;

82 virtual void ReloadOriginalRequestURL(bool check_for_repost) OVERRIDE;	82 virtual void ReloadOriginalRequestURL(bool check_for_repost) OVERRIDE;

(...skipping 296 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
379 TimeSmoother time_smoother_;	379 TimeSmoother time_smoother_;

380	380

381 scoped_ptr<WebContentsScreenshotManager> screenshot_manager_;	381 scoped_ptr<WebContentsScreenshotManager> screenshot_manager_;

382	382

383 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl);	383 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl);

384 };	384 };

385	385

386 } // namespace content	386 } // namespace content

387	387

388 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_	388 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_

OLD	NEW