Adding local html page used in Instant Extended mode when instant is disabled or unavailable.

chrome/browser/instant/instant_controller.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 27 matching lines @@
 namespace content {
 class WebContents;
 }
 
 // InstantController maintains a WebContents that is intended to give a preview
 // of search suggestions and results. InstantController is owned by Browser via
 // BrowserInstantController.
 class InstantController {
  public:
   InstantController(chrome::BrowserInstantController* browser,
-                    bool extended_enabled);
+                    bool extended_enabled,
+                    bool incognito_mode);

[dhollowa, 2012/12/13 01:20:15]

The notion of incognito is appropriate at the browser_instant_controller level,
but by the time it gets here the concept is really more |local_mode| or
|use_local|.

Also, I'd think that it would be the browser_instant_controller's responsibility
to detect changes in the default-search-provider and reset the InstantController
with the new appropriate value for |local_mode| or |use_local|, no?

This would apply to the offline case too I suppose, that is
browser_instant_controller would reset instant_controller if the user is/goes
offline.

[Shishir, 2012/12/13 22:57:58]

Like we discussed, renamed to use_local_preview_only.

   ~InstantController();
 
   // Invoked as the user types into the omnibox. |user_text| is what the user
   // has typed. |full_text| is what the omnibox is showing. These may differ if
   // the user typed only some text, and the rest was inline autocompleted. If
   // |verbatim| is true, search results are shown for the exact omnibox text,
   // rather than the best guess as to what the user means. Returns true if the
   // update is accepted (i.e., if |match| is a search rather than a URL).
   bool Update(const AutocompleteMatch& match,
               const string16& user_text,
@@ skipping 87 matching lines @@
   // Invoked by InstantLoader when the preview gains focus, usually due to the
   // user clicking on it.
   void InstantLoaderContentsFocused();
 
   // Invoked by the InstantLoader when its RenderView crashes.
   void InstantLoaderRenderViewGone();
 
   // Invoked by InstantLoader when the instant page is about to navigate.
   void InstantLoaderAboutToNavigateMainFrame(const GURL& url);
 
+  // The URL for the local omnibox popup.
+  static const char* kLocalOmniboxPopupURL;

[dhollowa, 2012/12/13 01:20:15]

nit: static const data members should be declared near the top of the class.

[Shishir, 2012/12/13 22:57:58]

Done.

+
  private:
   FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantLoaderRefresh);
 
   // Helper for OmniboxFocusChanged. Commit or discard the preview.
   void OmniboxLostFocus(gfx::NativeView view_gaining_focus);
 
   // Creates a new loader if necessary, using the instant_url property of the
   // |template_url| (for example, if the Instant URL has changed since the last
-  // time the loader was created). Returns false if the |template_url| doesn't
-  // have a valid Instant URL; true otherwise.
+  // time the loader was created). If |use_fallback| is true will use
+  // kLocalOmniboxPopupURL as the fallback url (in extended mode) in case
+  // the |template_url| doesn't have a valid Instant URL. Returns true if an
+  // instant URL could be determined.
   bool ResetLoader(const TemplateURL* template_url,
-                   const content::WebContents* active_tab);
+                   const content::WebContents* active_tab,
+                   bool use_fallback);

[dhollowa, 2012/12/13 01:20:15]

nit: use_local

[Shishir, 2012/12/13 22:57:58]

changed to fallback_to_local.

 
   // Ensures that the |loader_| uses the default Instant URL, recreating it if
   // necessary, and returns true. Returns false if the Instant URL could not be
   // determined or the active tab is NULL (browser is shutting down).
   bool CreateDefaultLoader();
 
   // Called when the |loader_| might be stale. If it's actually stale, and the
   // omnibox doesn't have focus, and the preview isn't showing, the |loader_| is
   // deleted and recreated. Else the refresh is skipped.
   void OnStaleLoader();
@@ skipping 30 matching lines @@
   bool GetInstantURL(const TemplateURL* template_url,
                      std::string* instant_url) const;
 
   chrome::BrowserInstantController* const browser_;
 
   // Whether the extended API and regular API are enabled. If both are false,
   // Instant is effectively disabled.
   const bool extended_enabled_;
   bool instant_enabled_;
 
+  // Whether the profile is in incognito mode.
+  const bool incognito_mode_;
+
   // The state of the preview page, i.e., the page owned by |loader_|. Ignored
   // if |instant_tab_| is in use.
   InstantModel model_;
 
   // The preview WebContents.
   scoped_ptr<InstantLoader> loader_;
 
   // A committed WebContents that supports Instant. If non-NULL, the |loader_|
   // is guaranteed to be hidden and messages will be sent to this instead.
   scoped_ptr<InstantTab> instant_tab_;
@@ skipping 60 matching lines @@
 
   // Whether to allow the preview to show search suggestions. In general, the
   // preview is allowed to show search suggestions whenever |search_mode_| is
   // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false.
   bool allow_preview_to_show_search_suggestions_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_