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

content/browser/web_contents/navigation_entry_impl.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 CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
+#include "base/values.h"

[sreeram, 2013/01/30 21:41:39]

Remove this? (it appears to be unused)

[Mathieu, 2013/01/30 21:55:12]

Done.

 #include "content/browser/site_instance_impl.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/common/ssl_status.h"
 
 namespace content {
 
 class CONTENT_EXPORT NavigationEntryImpl
     : public NON_EXPORTED_BASE(NavigationEntry) {
@@ skipping 48 matching lines @@
   virtual void SetOriginalRequestURL(const GURL& original_url) OVERRIDE;
   virtual const GURL& GetOriginalRequestURL() const OVERRIDE;
   virtual void SetIsOverridingUserAgent(bool override) OVERRIDE;
   virtual bool GetIsOverridingUserAgent() const OVERRIDE;
   virtual void SetTimestamp(base::Time timestamp) OVERRIDE;
   virtual base::Time GetTimestamp() const OVERRIDE;
   virtual void SetCanLoadLocalResources(bool allow) OVERRIDE;
   virtual bool GetCanLoadLocalResources() const OVERRIDE;
   virtual void SetFrameToNavigate(const std::string& frame_name) OVERRIDE;
   virtual const std::string& GetFrameToNavigate() const OVERRIDE;
+  virtual void SetExtraData(const std::string& key,
+                            const string16& data) OVERRIDE;
+  virtual const bool GetExtraData(const std::string& key,
+                                  string16* out_value) const OVERRIDE;

[sreeram, 2013/01/30 21:41:39]

virtual bool GetExtraData(const std::string& key, string16* data) const
OVERRIDE;

[Mathieu, 2013/01/30 21:55:12]

Done. Renamed throughout.

 
   void set_unique_id(int unique_id) {
     unique_id_ = unique_id;
   }
 
   // The SiteInstance tells us how to share sub-processes. This is a reference
   // counted pointer to a shared site instance.
   //
   // Note that the SiteInstance should usually not be changed after it is set,
   // but this may happen if the NavigationEntry was cloned and needs to use a
@@ skipping 170 matching lines @@
   bool should_replace_entry_;
 
   // Set when this entry should be able to access local file:// resources. This
   // value is not needed after the entry commits and is not persisted.
   bool can_load_local_resources_;
 
   // If not empty, the name of the frame to navigate. This field is not
   // persisted, because it is currently only used in tests.
   std::string frame_to_navigate_;
 
+  // Used to store extra data to support browser features.
+  typedef std::map<std::string, string16> ExtraDataMap;

[sreeram, 2013/01/30 21:41:39]

This typedef seems unnecessary, given that it's only used in one place.

[Mathieu, 2013/01/30 21:55:12]

Done.

+  ExtraDataMap extra_data_;
+
   // Copy and assignment is explicitly allowed for this class.
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_