| Index: chrome/browser/ui/search/instant_tab.h
|
| diff --git a/chrome/browser/ui/search/instant_tab.h b/chrome/browser/ui/search/instant_tab.h
|
| index 721acc52fbcacc0803dd82ea4234c913f2b2f453..68ea1368b054680b8ab35fba8e1dde058467857a 100644
|
| --- a/chrome/browser/ui/search/instant_tab.h
|
| +++ b/chrome/browser/ui/search/instant_tab.h
|
| @@ -8,9 +8,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| -#include "chrome/browser/ui/search/search_model_observer.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| -#include "ui/base/page_transition_types.h"
|
|
|
| class GURL;
|
|
|
| @@ -20,19 +18,13 @@ class WebContents;
|
|
|
| // InstantTab is used to exchange messages with a page that implements the
|
| // Instant/Embedded Search API (http://dev.chromium.org/embeddedsearch).
|
| -class InstantTab : public content::WebContentsObserver,
|
| - public SearchModelObserver {
|
| +class InstantTab : public content::WebContentsObserver {
|
| public:
|
| // InstantTab 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 upon determination of Instant API support. Either in response to
|
| - // the page loading or because we received some other message.
|
| - virtual void InstantSupportDetermined(const content::WebContents* contents,
|
| - bool supports_instant) = 0;
|
| -
|
| // Called when the page is about to navigate to |url|.
|
| virtual void InstantTabAboutToNavigateMainFrame(
|
| const content::WebContents* contents,
|
| @@ -42,8 +34,7 @@ class InstantTab : public content::WebContentsObserver,
|
| virtual ~Delegate();
|
| };
|
|
|
| - explicit InstantTab(Delegate* delegate, content::WebContents* web_contents);
|
| -
|
| + InstantTab(Delegate* delegate, content::WebContents* web_contents);
|
| ~InstantTab() override;
|
|
|
| // Sets up communication with the WebContents passed to the constructor. Does
|
| @@ -55,12 +46,6 @@ class InstantTab : public content::WebContentsObserver,
|
| void DidFinishNavigation(
|
| content::NavigationHandle* navigation_handle) override;
|
|
|
| - // Overridden from SearchModelObserver:
|
| - void ModelChanged(const SearchModel::State& old_state,
|
| - const SearchModel::State& new_state) override;
|
| -
|
| - void InstantSupportDetermined(bool supports_instant);
|
| -
|
| Delegate* const delegate_;
|
|
|
| content::WebContents* pending_web_contents_;
|
|
|