InstantExtended: don't reset InstantTab if not ready.

chrome/browser/ui/search/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_UI_SEARCH_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
 
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 193 matching lines @@
   content::PageTransition last_transition_type() const {
     return last_transition_type_;
   }
 
   // Non-const for Add/RemoveObserver only.  Other model changes should only
   // happen through the InstantController interface.
   InstantOverlayModel* model() { return &model_; }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant);
+  FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UsesOverlayIfTabNotReady);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
                            SearchQueryNotDisplayedForNavsuggest);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, SetWithTemplateURL);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefresh);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefreshDifferentOrder);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantRenderViewGone);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, RestrictedItemReadback);
@@ skipping 151 matching lines @@
       const std::vector<InstantMostVisitedItemIDPair>& items);
 
   // If possible, tries to mutate |suggestion| to a valid suggestion. Returns
   // true if successful. (Note that |suggestion| may be modified even if this
   // returns false.)
   bool FixSuggestion(InstantSuggestion* suggestion) const;
 
   // Returns true if the local page is being used.
   bool UsingLocalPage() const;
 
+  // Returns true iff |use_tab_for_suggestions_| is true and |instant_tab_|
+  // exists.
+  bool UseTabForSuggestions() const;
+
   BrowserInstantController* const browser_;
 
   // Whether the extended API and regular API are enabled. If both are false,
   // Instant is effectively disabled.
   const bool extended_enabled_;
   bool instant_enabled_;
 
   // If true, the Instant URL is set to kChromeSearchLocalNtpUrl.
   bool use_local_page_only_;
 
   // The state of the overlay page, i.e., the page owned by |overlay_|. Ignored
   // if |instant_tab_| is in use.
   InstantOverlayModel model_;
 
   // The three instances of InstantPage maintained by InstantController as
   // described above. All three may be non-NULL in extended mode.  If
   // |instant_tab_| is not NULL, then |overlay_| is guaranteed to be hidden and
   // messages will be sent to |instant_tab_| instead.
   //
   // In non-extended mode, only |overlay_| is ever non-NULL.
   scoped_ptr<InstantOverlay> overlay_;
   scoped_ptr<InstantNTP> ntp_;
   scoped_ptr<InstantTab> instant_tab_;
 
+  // If true, send suggestion-related events (such as user key strokes, auto
+  // complete results, etc.) to |instant_tab_| instead of |overlay_|. Once set
+  // to false, will stay false until the overlay is hidden or committed.
+  bool use_tab_for_suggestions_;
+
   // The most recent full_text passed to Update(). If empty, we'll not accept
   // search suggestions from |overlay_| or |instant_tab_|.
   string16 last_omnibox_text_;
 
   // The most recent user_text passed to Update(). Used to filter out-of-date
   // URL suggestions from the Instant page. Set in Update() and cleared when
   // the page sets temporary text (SetSuggestions() with REPLACE behavior).
   string16 last_user_text_;
 
   // True if the last Update() had an inline autocompletion. Used only to make
@@ skipping 56 matching lines @@
   // Used for Top Sites async retrieval.
   base::WeakPtrFactory<InstantController> weak_ptr_factory_;
 
   // Used to get notifications about Most Visted changes.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_