Persist the Instant API to committed search result pages.

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>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/instant/instant_commit_type.h"
 #include "chrome/browser/instant/instant_model.h"
 #include "chrome/common/instant_types.h"
 #include "chrome/common/search_types.h"
 #include "content/public/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 
 struct AutocompleteMatch;
 class AutocompleteProvider;
 class InstantLoader;
-class TabContents;
+class InstantTab;
 class TemplateURL;
-struct ThemeBackgroundInfo;
+
 
 namespace chrome {
 class BrowserInstantController;
 }
 
+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);
   ~InstantController();
 
   // Invoked as the user types into the omnibox. |user_text| is what the user
@@ skipping 14 matching lines @@
 
   // Send autocomplete results from |providers| to the preview page.
   void HandleAutocompleteResults(
       const std::vector<AutocompleteProvider*>& providers);
 
   // Called when the user presses up or down. |count| is a repeat count,
   // negative for moving up, positive for moving down. Returns true if Instant
   // handled the key press.
   bool OnUpOrDownKeyPressed(int count);
 
-  // The preview TabContents. May be NULL if ReleasePreviewContents() has been
-  // called, with no subsequent successful call to Update(). InstantController
-  // retains ownership of the object.
-  TabContents* GetPreviewContents() const;
+  // The preview WebContents. May be NULL if CommitIfCurrent() has been called,
+  // with no subsequent successful call to Update(). InstantController retains
+  // ownership of the object.
+  content::WebContents* GetPreviewContents() const;
 
   // Returns true if the Instant preview can be committed now.
   bool IsCurrent() const;
 
   // If the preview is showing search results, commits the preview, calling
   // CommitInstant() on the browser, and returns true. Else, returns false.
   bool CommitIfCurrent(InstantCommitType type);
 
   // The omnibox has lost focus. Commit or discard the preview accordingly.
   void OmniboxLostFocus(gfx::NativeView view_gaining_focus);
 
   // The omnibox has gained focus. Preload the default search engine, in
   // anticipation of the user typing a query.
   void OmniboxGotFocus();
 
   // The search mode in the active tab has changed. Pass the message down to
-  // the loader which will notify the renderer.
+  // the loader which will notify the renderer. Create |instant_tab_| if the
+  // |new_mode| reflects an Instant search results page.
   void SearchModeChanged(const chrome::search::Mode& old_mode,
                          const chrome::search::Mode& new_mode);
 
-  // The user switched tabs. Hide the preview if needed.
+  // The user switched tabs. Hide the preview if needed. Create |instant_tab_|
+  // if the newly active tab is an Instant search results page.
   void ActiveTabChanged();
 
   // Sets whether Instant should show result previews.
   void SetInstantEnabled(bool instant_enabled);
 
   // The theme has changed.  Pass the message down to the loader which will
   // notify the renderer.
   void ThemeChanged(const ThemeBackgroundInfo& theme_info);
 
   // The theme area height has changed.  Pass the message down to the loader
   // which will notify the renderer.
   void ThemeAreaHeightChanged(int height);
 
   // Returns the transition type of the last AutocompleteMatch passed to Update.
   content::PageTransition last_transition_type() const {
     return last_transition_type_;
   }
 
   const InstantModel* model() const { return &model_; }
 
-  // Invoked by InstantLoader when it has suggested text.
-  void SetSuggestions(InstantLoader* loader,
+  // Invoked by the page when it has suggested text.
+  void SetSuggestions(const content::WebContents* contents,
                       const std::vector<InstantSuggestion>& suggestions);
 
-  // Invoked by InstantLoader to commit the preview.
-  void CommitInstantLoader(InstantLoader* loader);
+  // Invoked by the page when its support for the Instant API is determined.
+  void InstantSupportDetermined(const content::WebContents* contents,
+                                bool supports_instant);
 
   // Invoked by InstantLoader to request that the preview be shown.
-  void ShowInstantPreview(InstantLoader* loader,
-                          InstantShownReason reason,
+  void ShowInstantPreview(InstantShownReason reason,
                           int height,
                           InstantSizeUnits units);
 
-  // Invoked by InstantLoader when it has determined whether or not the page
-  // supports the Instant API.
-  void InstantSupportDetermined(InstantLoader* loader, bool supports_instant);
-
-  // Invoked by InstantLoader when it has swapped a different TabContents into
+  // Invoked by InstantLoader when it has swapped a different WebContents into
   // the preview, usually because a prerendered page was navigated to.
-  void SwappedTabContents(InstantLoader* loader);
+  void SwappedWebContents();
 
   // Invoked by InstantLoader when the preview gains focus, usually due to the
   // user clicking on it.
-  void InstantLoaderContentsFocused(InstantLoader* loader);
-
-#if defined(UNIT_TEST)
-  // Accessors used only in tests.
-  InstantLoader* loader() const { return loader_.get(); }
-#endif
+  void InstantLoaderContentsFocused();
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant);
+  FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantLoaderRefresh);
 
   // 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.
   bool ResetLoader(const TemplateURL* template_url,
-                   const TabContents* active_tab);
+                   const content::WebContents* active_tab);
 
   // 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();
 
-  // Destroys the |loader_| and its preview contents.
-  void DeleteLoader();
+  // 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();
 
-  // Hide the preview. If |clear_query| is true, clears query text and sends a
-  // an onchange event (with blank query) to the preview, telling it to clear
-  // out results for any old queries.
-  void Hide(bool clear_query);
+  // Hide the preview. Also sends an onchange event (with blank query) to the
+  // preview, telling it to clear out results for any old queries.
+  void Hide();
 
-  // Counterpart to Hide(). Asks the |browser_| to display the preview with
-  // the given |height|.
+  // Like Hide(), but doesn't call OnStaleLoader(). You'll almost always want
+  // Hide(). Use this only if you are going to call loader_.reset() afterwards.
+  void HideInternal();
+
+  // Counterpart to Hide(). Asks the |browser_| to display the preview with the
+  // given |height|.
   void Show(InstantShownReason reason, int height, InstantSizeUnits units);
 
   // Send the omnibox dropdown bounds to the page.
   void SendBoundsToPage();
 
   // If |template_url| is a valid TemplateURL for use with Instant, fills in
   // |instant_url| and returns true; returns false otherwise.
   // Note: If the command-line switch kInstantURL is set, this method uses its
   // value for |instant_url| and returns true without examining |template_url|.
   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_;
 
+  // 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, messages will
+  // be sent to this, instead of |loader_| (which will be hidden).
+  scoped_ptr<InstantTab> instant_tab_;
+
   // The most recent user_text passed to Update().
   string16 last_user_text_;
 
   // The most recent full_text passed to Update().
   string16 last_full_text_;
 
   // The most recent verbatim passed to Update().
   bool last_verbatim_;
 
   // The most recent suggestion received from the page, minus any prefix that
@@ skipping 31 matching lines @@
   // Instant API (or we assume it does, since we haven't determined it doesn't).
   std::map<std::string, int> blacklisted_urls_;
 
   // Search terms extraction (for autocomplete history matches) doesn't work
   // on Instant URLs. So, whenever the user commits an Instant search, we add
   // an equivalent non-Instant search URL to history, so that the search shows
   // up in autocomplete history matches.
   GURL url_for_history_;
 
   // The timestamp at which query editing began. This value is used when the
-  // first set of suggestions is processed and cleared when the overlay is
-  // hidden.
+  // preview is showed and cleared when the preview is hidden.
   base::Time first_interaction_time_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_