Instant Extended: Fallback to local preview if the remote instant page is not ready on user input.

chrome/browser/instant/instant_controller.h

Index: chrome/browser/instant/instant_controller.h
diff --git a/chrome/browser/instant/instant_controller.h b/chrome/browser/instant/instant_controller.h
index 5c4d01c09014faab7f61288380bbc2758e2b0388..d9039e3c41396a2cb9066d8754479c2bdab6bb15 100644
--- a/chrome/browser/instant/instant_controller.h
+++ b/chrome/browser/instant/instant_controller.h
@@ -187,6 +187,14 @@ class InstantController {
     return debug_events_;
   }
 
+  // Variable accessors required by the InstantLoader.
+  bool extended_enabled() const { return extended_enabled_; }
+  bool instant_enabled() const { return instant_enabled_; }
+  chrome::search::Mode search_mode() const { return search_mode_; }
+  OmniboxFocusState omnibox_focus_state() const { return omnibox_focus_state_; }
+  int start_margin() const { return start_margin_; }
+  int end_margin() const { return end_margin_; }

[sreeram, 2013/01/30 19:28:08]

Won't it be simpler to just have the InstantLoader call into the
InstantController (say controller_->RenderViewCreated()) and have the
InstantController perform all the initializations? Especially since some of
these are already APIs that the IC calls on the IL (such as SetMarginSize(),
SetDisplayInstantResults, etc). Then you don't need all these accessors.

[Shishir, 2013/01/31 23:46:47]

Done.

+
  private:
   FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, SetWithTemplateURL);
@@ -215,6 +223,11 @@ class InstantController {
   // deleted and recreated. Else the refresh is skipped.
   void OnStaleLoader();
 
+  // If the |loader_| being used is in fallback mode, it will be switched back
+  // to the remote loader if the loader is not showing and the omnibox does not
+  // have focus.
+  void MaybeSwitchToRemoteLoader();
+
   // If the active tab is an Instant search results page, sets |instant_tab_| to
   // point to it. Else, deletes any existing |instant_tab_|.
   void ResetInstantTab();