Commit instant loader when the instant page navigates away from instant URL.

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 59 matching lines @@
       const std::vector<AutocompleteProvider*>& providers);
 
   // Called when the user presses up or down. |count| is a repeat count,
   // 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 can be committed now.
-  bool IsCurrent() const;
+  // Returns true if the Instant preview is in search mode and can be committed.
+  bool IsCurrentSearch() const;
 
-  // If the preview is showing search results, commits the preview, calling
-  // CommitInstant() on the browser, and returns true. Else, returns false.
+  // If the preview is showing search results, or navigating, commits the
+  // preview, calling CommitInstant() on the browser, and returns true. Else,
+  // returns false.
   bool CommitIfCurrent(InstantCommitType type);
 
   // The omnibox has lost focus. Commit or discard the preview accordingly.
   void OmniboxLostFocus(gfx::NativeView view_gaining_focus);
 
   // The omnibox has gained focus. Preload the default search engine, in
   // anticipation of the user typing a query.
   void OmniboxGotFocus();
 
   // The search mode in the active tab has changed. Pass the message down to
@@ skipping 43 matching lines @@
   // the preview, usually because a prerendered page was navigated to.
   void SwappedWebContents();
 
   // Invoked by InstantLoader when the preview gains focus, usually due to the
   // user clicking on it.
   void InstantLoaderContentsFocused();
 
   // Invoked by the InstantLoader when its RenderView crashes.
   void InstantLoaderRenderViewGone();
 
+  // Invoked by InstantLoader when the instant page is about to navigate.
+  void InstantLoaderAboutToNavigateMainFrame(const GURL& url);
+
  private:
   FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantLoaderRefresh);
 
   // Creates a new loader if necessary, using the instant_url property of the
   // |template_url| (for example, if the Instant URL has changed since the last
   // time the loader was created). Returns false if the |template_url| doesn't
   // have a valid Instant URL; true otherwise.
   bool ResetLoader(const TemplateURL* template_url,
@@ skipping 121 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_