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

chrome/browser/sessions/session_types.h

 // Copyright (c) 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_SESSIONS_SESSION_TYPES_H_
 #define CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_
 
 #include <algorithm>
 #include <string>
 #include <vector>
@@ skipping 69 matching lines @@
   // This is used when determining the selected TabNavigation and only
   // used by SessionService.
   int index() const { return index_; }
   void set_index(int index) { index_ = index; }
 
   // Accessors for some fields taken from NavigationEntry.
   int unique_id() const { return unique_id_; }
   const GURL& virtual_url() const { return virtual_url_; }
   const string16& title() const { return title_; }
   const std::string& content_state() const { return content_state_; }
+  const string16& search_terms() const { return search_terms_; }
 
   // Converts a set of TabNavigations into a list of NavigationEntrys
   // with sequential page IDs and the given context. The caller owns
   // the returned NavigationEntrys.
   static std::vector<content::NavigationEntry*>
   CreateNavigationEntriesFromTabNavigations(
       const std::vector<TabNavigation>& navigations,
       content::BrowserContext* browser_context);
 
  private:
   friend struct SessionTypesTestHelper;
 
   // Index in the NavigationController.
   int index_;
 
   // Member variables corresponding to NavigationEntry fields.
   int unique_id_;
   content::Referrer referrer_;
   GURL virtual_url_;
   string16 title_;
   std::string content_state_;
   content::PageTransition transition_type_;
   bool has_post_data_;
   int64 post_id_;
   GURL original_request_url_;
   bool is_overriding_user_agent_;
   base::Time timestamp_;
+  string16 search_terms_;
 };
 
 // SessionTab ----------------------------------------------------------------
 
 // SessionTab corresponds to a NavigationController.
 struct SessionTab {
   SessionTab();
   ~SessionTab();
 
   // Since the current_navigation_index can be larger than the index for number
@@ skipping 109 matching lines @@
   // Is the window maximized, minimized, or normal?
   ui::WindowShowState show_state;
 
   std::string app_name;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SessionWindow);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_