InstantExtended: hook up InstantTab in incognito.

chrome/browser/ui/search/instant_overlay.h

 // Copyright 2013 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_UI_SEARCH_INSTANT_OVERLAY_H_
 #define CHROME_BROWSER_UI_SEARCH_INSTANT_OVERLAY_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 14 matching lines @@
 // InstantOverlay is used to communicate with an overlay WebContents that it
 // owns and loads the "Instant URL" into. This overlay can appear and disappear
 // at will as the user types in the omnibox.
 class InstantOverlay : public InstantPage,
                        public InstantLoader::Delegate {
  public:
   // Returns the InstantOverlay for |contents| if it's used for Instant.
   static InstantOverlay* FromWebContents(const content::WebContents* contents);
 
   InstantOverlay(InstantController* controller,
-                 const std::string& instant_url);
+                 const std::string& instant_url,
+                 bool is_incognito);
   virtual ~InstantOverlay();
 
   // Creates a new WebContents and loads |instant_url_| into it. Uses
   // |active_tab|, if non-NULL, to initialize the size of the WebContents.
   void InitContents(Profile* profile,
                     const content::WebContents* active_tab);
 
   // Releases the overlay WebContents. This should be called when the overlay
   // is committed.
   scoped_ptr<content::WebContents> ReleaseContents();
@@ skipping 11 matching lines @@
   // Returns info about the last navigation by the Instant page. If the page
   // hasn't navigated since the last Update(), the URL is empty.
   const history::HistoryAddPageArgs& last_navigation() const {
     return last_navigation_;
   }
 
   // Called by the history tab helper with information that it would have added
   // to the history service had this WebContents not been used for Instant.
   void DidNavigate(const history::HistoryAddPageArgs& add_page_args);
 
-  // Overridden from InstantPage:
-  virtual void Update(const string16& text,
-                      size_t selection_start,
-                      size_t selection_end,
-                      bool verbatim) OVERRIDE;
+  // Wrapper around InstantIPCSender::Update that also clears
+  // |last_navigation_|.
+  void Update(const string16& text,
+              size_t selection_start,
+              size_t selection_end,
+              bool verbatim);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefresh);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefreshDifferentOrder);
 
   // Helper to access delegate() as an InstantController object.
   InstantController* instant_controller() const {
     return static_cast<InstantController*>(delegate());
   }
 
@@ skipping 20 matching lines @@
 
   InstantLoader loader_;
   bool is_stale_;
   bool is_pointer_down_from_activate_;
   history::HistoryAddPageArgs last_navigation_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantOverlay);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_OVERLAY_H_