diff options
author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/content/public/browser/navigation_controller.h | |
parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/content/public/browser/navigation_controller.h')
-rw-r--r-- | chromium/content/public/browser/navigation_controller.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chromium/content/public/browser/navigation_controller.h b/chromium/content/public/browser/navigation_controller.h index 0f77d7e0a4f..47f3123afa1 100644 --- a/chromium/content/public/browser/navigation_controller.h +++ b/chromium/content/public/browser/navigation_controller.h @@ -300,7 +300,8 @@ class NavigationController { virtual void LoadURLWithParams(const LoadURLParams& params) = 0; // Loads the current page if this NavigationController was restored from - // history and the current page has not loaded yet. + // history and the current page has not loaded yet or if the load was + // explicitly requested using SetNeedsReload(). virtual void LoadIfNecessary() = 0; // Renavigation -------------------------------------------------------------- @@ -364,9 +365,15 @@ class NavigationController { virtual int32 GetMaxRestoredPageID() const = 0; // Returns true if a reload happens when activated (SetActive(true) is - // invoked). This is true for session/tab restore and cloned tabs. + // invoked). This is true for session/tab restore, cloned tabs and tabs that + // requested a reload (using SetNeedsReload()) after their renderer was + // killed. virtual bool NeedsReload() const = 0; + // Request a reload to happen when activated. This can be used when a renderer + // backing a background tab is killed by the system on Android or ChromeOS. + virtual void SetNeedsReload() = 0; + // Cancels a repost that brought up a warning. virtual void CancelPendingReload() = 0; // Continues a repost that brought up a warning. |