Index: chrome/browser/ui/search/instant_controller.h |
diff --git a/chrome/browser/ui/search/instant_controller.h b/chrome/browser/ui/search/instant_controller.h |
index 3030b7a68252c7187c4fb3ea3984b60db1fd88e1..b25d728ffce5362ebaa0ecba1ec60212d0d384fc 100644 |
--- a/chrome/browser/ui/search/instant_controller.h |
+++ b/chrome/browser/ui/search/instant_controller.h |
@@ -228,6 +228,7 @@ class InstantController : public InstantPage::Delegate, |
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPRenderViewGone); |
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
PreloadedNTPDoesntSupportInstant); |
+ FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, RedirectToLocalOnLoadFailure); |
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation); |
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance); |
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ValidatesSuggestions); |
@@ -279,6 +280,7 @@ class InstantController : public InstantPage::Delegate, |
const GURL& url, |
content::PageTransition transition, |
WindowOpenDisposition disposition) OVERRIDE; |
+ virtual void InstantPageLoadFailed(content::WebContents* contents) OVERRIDE; |
// Invoked by the InstantLoader when the Instant page wants to delete a |
// Most Visited item. |
@@ -294,6 +296,10 @@ class InstantController : public InstantPage::Delegate, |
// Most Visited deletions. |
virtual void UndoAllMostVisitedDeletions() OVERRIDE; |
+ // Helper function to navigate the given contents to the local fallback |
+ // Instant URL and trim the history correctly. |
+ void RedirectToLocalNTP(content::WebContents* contents); |
+ |
// Helper for OmniboxFocusChanged. Commit or discard the overlay. |
void OmniboxLostFocus(gfx::NativeView view_gaining_focus); |
@@ -338,6 +344,9 @@ class InstantController : public InstantPage::Delegate, |
// point to it. Else, deletes any existing |instant_tab_|. |
void ResetInstantTab(); |
+ // Sends theme info, omnibox bounds, font info, etc. down to the Instant tab. |
+ void UpdateInfoForInstantTab(); |
+ |
// Hide the overlay. Also sends an onchange event (with blank query) to the |
// overlay, telling it to clear out results for any old queries. |
void HideOverlay(); |