[Search] Store and recall search terms using NavigationEntry to improve search term extraction

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 29 matching lines @@
 }
 
 // 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:
   // The URL for the local omnibox popup.
   static const char* kLocalOmniboxPopupURL;
 
+  // The key used to store search terms data in the NavigationEntry.
+  static const std::string kSearchTermsKey;

[sky, 2013/01/16 22:32:37]

static should not be objects, only primitive types.

[Mathieu, 2013/01/17 15:59:29]

Done.

+
   // |use_local_preview_only| will force the use of kLocalOmniboxPopupURL as the
   // instant URL and is only applicable if |extended_enabled| is true.
   InstantController(chrome::BrowserInstantController* browser,
                     bool extended_enabled,
                     bool use_local_preview_only);
   ~InstantController();
 
+  const string16& last_omnibox_text() const { return last_omnibox_text_; }
+
   // 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).
   // |is_keyword_search| is true if keyword searching is in effect.
   bool Update(const AutocompleteMatch& match,
               const string16& user_text,
               const string16& full_text,
@@ skipping 19 matching lines @@
   // negative for moving up, positive for moving down. Returns true if Instant
   // handled the key press.
   bool OnUpOrDownKeyPressed(int count);
 
   // The preview WebContents. May be NULL. InstantController retains ownership.
   content::WebContents* GetPreviewContents() const;
 
   // Returns true if the Instant preview is showing a search results preview.
   bool IsPreviewingSearchResults() const;
 
+  // Returns true if an instant extended search is currently being done.
+  bool IsInstantExtendedSearch() const;
+
   // If the preview is showing search results, commits the preview, calling
   // CommitInstant() on the browser, and returns true. Else, returns false.
   bool CommitIfPossible(InstantCommitType type);
 
   // Called to indicate that the omnibox focus state changed with the given
   // |reason|. If |focus_state| is FOCUS_NONE, |view_gaining_focus| is set to
   // the view gaining focus.
   void OmniboxFocusChanged(OmniboxFocusState focus_state,
                            OmniboxFocusChangeReason reason,
                            gfx::NativeView view_gaining_focus);
@@ skipping 215 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_