Move instant support to SearchTabHelper.

chrome/browser/ui/search/instant_page.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_PAGE_H_
 #define CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
+#include "chrome/browser/ui/search/search_model_observer.h"
 #include "chrome/common/instant_types.h"
 #include "chrome/common/omnibox_focus_state.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/page_transition_types.h"
 
 class GURL;
 
 namespace content {
 struct FrameNavigateParams;
 struct LoadCommittedDetails;
 class WebContents;
 }
 
 namespace gfx {
 class Rect;
 }
 
 // InstantPage is used to exchange messages with a page that implements the
 // Instant/Embedded Search API (http://dev.chromium.org/embeddedsearch).
 // InstantPage is not used directly but via one of its derived classes:
 // InstantOverlay, InstantNTP and InstantTab.
-class InstantPage : public content::WebContentsObserver {
+class InstantPage : public content::WebContentsObserver,
+                    public SearchModelObserver {
  public:
   // InstantPage calls its delegate in response to messages received from the
   // page. Each method is called with the |contents| corresponding to the page
   // we are observing.
   class Delegate {
    public:
     // Called when a RenderView is created, so that state can be initialized.
     virtual void InstantPageRenderViewCreated(
         const content::WebContents* contents) = 0;
 
@@ skipping 103 matching lines @@
   // by the omnibox dropdown.
   void SetPopupBounds(const gfx::Rect& bounds);
 
   // Tells the page the bounds of the omnibox (in screen coordinates). This is
   // used by the page to align text or assets properly with the omnibox.
   void SetOmniboxBounds(const gfx::Rect& bounds);
 
   // Tells the page about the font information.
   void InitializeFonts();
 
-  // Tells the renderer to determine if the page supports the Instant API, which
-  // results in a call to InstantSupportDetermined() when the reply is received.
-  void DetermineIfPageSupportsInstant();
-
   // Tells the page about the available autocomplete results.
   void SendAutocompleteResults(
       const std::vector<InstantAutocompleteResult>& results);
 
   // Tells the page that the user pressed Up or Down in the omnibox. |count| is
   // a repeat count, negative for moving up, positive for moving down.
   void UpOrDownKeyPressed(int count);
 
   // Tells the page that the user pressed Esc key in the omnibox.
   void EscKeyPressed();
@@ skipping 37 matching lines @@
   virtual bool ShouldProcessAboutToNavigateMainFrame();
   virtual bool ShouldProcessSetSuggestions();
   virtual bool ShouldProcessShowInstantOverlay();
   virtual bool ShouldProcessFocusOmnibox();
   virtual bool ShouldProcessNavigateToURL();
 
  private:
   // Overridden from content::WebContentsObserver:
   virtual void RenderViewCreated(
       content::RenderViewHost* render_view_host) OVERRIDE;
-  virtual void DidFinishLoad(
-      int64 frame_id,
-      const GURL& validated_url,
-      bool is_main_frame,
-      content::RenderViewHost* render_view_host) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
   virtual void DidCommitProvisionalLoadForFrame(
       int64 frame_id,
       bool is_main_frame,
       const GURL& url,
       content::PageTransition transition_type,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE;
   virtual void DidFailProvisionalLoad(
       int64 frame_id,
       bool is_main_frame,
       const GURL& validated_url,
       int error_code,
       const string16& error_description,
       content::RenderViewHost* render_view_host) OVERRIDE;
 
+  // Overridden from SearchModelObserver:
+  virtual void ModelChanged(const SearchModel::State& old_state,
+                            const SearchModel::State& new_state) OVERRIDE;
+
+  // Helper to look up the SearchModel for this page.
+  SearchModel* GetSearchModel();
+
+  // Update the status of Instant support.
+  void SetSupportsInstant(bool supports_instant);
+
   void OnSetSuggestions(int page_id,
                         const std::vector<InstantSuggestion>& suggestions);
-  void OnInstantSupportDetermined(int page_id, bool supports_instant);
   void OnShowInstantOverlay(int page_id,
                             int height,
                             InstantSizeUnits units);
   void OnFocusOmnibox(int page_id, OmniboxFocusState state);
   void OnSearchBoxNavigate(int page_id,
                            const GURL& url,
                            content::PageTransition transition,
                            WindowOpenDisposition disposition);
   void OnDeleteMostVisitedItem(InstantRestrictedID most_visited_item_id);
   void OnUndoMostVisitedDeletion(InstantRestrictedID most_visited_item_id);
   void OnUndoAllMostVisitedDeletions();
 
   Delegate* const delegate_;
   const std::string instant_url_;
+  const bool extended_enabled_;
   bool supports_instant_;
   bool instant_support_determined_;

[samarth, 2013/05/10 01:32:38]

Is this necessary anymore?

[kmadhusu, 2013/05/13 17:13:24]

Removed. Fixed interactive_ui_tests to use supports_instant() instead of
instant_support_determined() .

 
   DISALLOW_COPY_AND_ASSIGN(InstantPage);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_