[Search] No longer reverting omnibox text on instant search

chrome/browser/sessions/session_types.cc

 // 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.
 
 #include "chrome/browser/sessions/session_types.h"
 
 #include "base/basictypes.h"
 #include "base/pickle.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
@@ skipping 23 matching lines @@
 // static
 TabNavigation TabNavigation::FromNavigationEntry(
     int index,
     const NavigationEntry& entry) {
   TabNavigation navigation;
   navigation.index_ = index;
   navigation.unique_id_ = entry.GetUniqueID();
   navigation.referrer_ = entry.GetReferrer();
   navigation.virtual_url_ = entry.GetVirtualURL();
   navigation.title_ = entry.GetTitle();
+  navigation.search_terms_ = entry.GetSearchTerms();
   navigation.content_state_ = entry.GetContentState();
   navigation.transition_type_ = entry.GetTransitionType();
   navigation.has_post_data_ = entry.GetHasPostData();
   navigation.post_id_ = entry.GetPostID();
   navigation.original_request_url_ = entry.GetOriginalRequestURL();
   navigation.is_overriding_user_agent_ = entry.GetIsOverridingUserAgent();
   navigation.timestamp_ = entry.GetTimestamp();
   return navigation;
 }
 
 TabNavigation TabNavigation::FromSyncData(
     int index,
     const sync_pb::TabNavigation& sync_data) {
   TabNavigation navigation;
   navigation.index_ = index;
   navigation.unique_id_ = sync_data.unique_id();
   navigation.referrer_ =
       content::Referrer(GURL(sync_data.referrer()),
                         WebKit::WebReferrerPolicyDefault);
   navigation.virtual_url_ = GURL(sync_data.virtual_url());
   navigation.title_ = UTF8ToUTF16(sync_data.title());
+  navigation.search_terms_ = UTF8ToUTF16(sync_data.search_terms());
   navigation.content_state_ = sync_data.state();
 
   uint32 transition = 0;
   if (sync_data.has_page_transition()) {
     switch (sync_data.page_transition()) {
       case sync_pb::SyncEnums_PageTransition_LINK:
         transition = content::PAGE_TRANSITION_LINK;
         break;
       case sync_pb::SyncEnums_PageTransition_TYPED:
         transition = content::PAGE_TRANSITION_TYPED;
@@ skipping 109 matching lines @@
   HAS_POST_DATA = 1
 };
 
 }  // namespace
 
 // Pickle order:
 //
 // index_
 // virtual_url_
 // title_
+// search_terms_
 // content_state_
 // transition_type_
 //
 // Added on later:
 //
 // type_mask (has_post_data_)
 // referrer_
 // original_request_url_
 // is_overriding_user_agent_
 // timestamp_
 
 void TabNavigation::WriteToPickle(Pickle* pickle) const {
   pickle->WriteInt(index_);
 
   // We only allow navigations up to 63k (which should be completely
   // reasonable). On the off chance we get one that is too big, try to
   // keep the url.
 
   // Bound the string data (which is variable length) to
   // |max_state_size bytes| bytes.
   static const size_t max_state_size =
       std::numeric_limits<SessionCommand::size_type>::max() - 1024;
   int bytes_written = 0;
 
   WriteStringToPickle(pickle, &bytes_written, max_state_size,
                       virtual_url_.spec());
 
   WriteString16ToPickle(pickle, &bytes_written, max_state_size, title_);
 
+  WriteString16ToPickle(pickle, &bytes_written, max_state_size, search_terms_);
+
   std::string content_state = content_state_;
   if (has_post_data_) {
     content_state =
         webkit_glue::RemovePasswordDataFromHistoryState(content_state);
   }
   WriteStringToPickle(pickle, &bytes_written, max_state_size, content_state);
 
   pickle->WriteInt(transition_type_);
 
   const int type_mask = has_post_data_ ? HAS_POST_DATA : 0;
@@ skipping 14 matching lines @@
   pickle->WriteInt64(timestamp_.ToInternalValue());
 }
 
 bool TabNavigation::ReadFromPickle(PickleIterator* iterator) {
   *this = TabNavigation();
   std::string virtual_url_spec;
   int transition_type_int = 0;
   if (!iterator->ReadInt(&index_) ||
       !iterator->ReadString(&virtual_url_spec) ||
       !iterator->ReadString16(&title_) ||
+      !iterator->ReadString16(&search_terms_) ||

[akalin, 2012/12/05 19:40:27]

this isn't backwards compatible.  it needs to go last and be optional.

[Mathieu, 2012/12/05 20:42:16]

Done. Let me know if this is the way to do it.

       !iterator->ReadString(&content_state_) ||
       !iterator->ReadInt(&transition_type_int))
     return false;
   virtual_url_ = GURL(virtual_url_spec);
   transition_type_ = static_cast<content::PageTransition>(transition_type_int);
 
   // type_mask did not always exist in the written stream. As such, we
   // don't fail if it can't be read.
   int type_mask = 0;
   bool has_type_mask = iterator->ReadInt(&type_mask);
@@ skipping 45 matching lines @@
           referrer_,
           // Use a transition type of reload so that we don't incorrectly
           // increase the typed count.
           content::PAGE_TRANSITION_RELOAD,
           false,
           // The extra headers are not sync'ed across sessions.
           std::string(),
           browser_context));
 
   entry->SetTitle(title_);
+  entry->SetSearchTerms(search_terms_);
   entry->SetContentState(content_state_);
   entry->SetPageID(page_id);
   entry->SetHasPostData(has_post_data_);
   entry->SetPostID(post_id_);
   entry->SetOriginalRequestURL(original_request_url_);
   entry->SetIsOverridingUserAgent(is_overriding_user_agent_);
   entry->SetTimestamp(timestamp_);
 
   return entry.Pass();
 }
 
 // TODO(zea): perhaps sync state (scroll position, form entries, etc.) as well?
 // See http://crbug.com/67068.
 sync_pb::TabNavigation TabNavigation::ToSyncData() const {
   sync_pb::TabNavigation sync_data;
   sync_data.set_virtual_url(virtual_url_.spec());
   // FIXME(zea): Support referrer policy?
   sync_data.set_referrer(referrer_.url.spec());
   sync_data.set_title(UTF16ToUTF8(title_));
+  sync_data.set_search_terms(UTF16ToUTF8(search_terms_))
 
   // Page transition core.
   COMPILE_ASSERT(content::PAGE_TRANSITION_LAST_CORE ==
                  content::PAGE_TRANSITION_KEYWORD_GENERATED,
                  PageTransitionCoreBounds);
   switch (PageTransitionStripQualifier(transition_type_)) {
     case content::PAGE_TRANSITION_LINK:
       sync_data.set_page_transition(
           sync_pb::SyncEnums_PageTransition_LINK);
       break;
@@ skipping 135 matching lines @@
 SessionWindow::SessionWindow()
     : selected_tab_index(-1),
       type(Browser::TYPE_TABBED),
       is_constrained(true),
       show_state(ui::SHOW_STATE_DEFAULT) {
 }
 
 SessionWindow::~SessionWindow() {
   STLDeleteElements(&tabs);
 }