Cleanup: Remove SearchTabHelperDelegate

chrome/browser/ui/search/search_tab_helper.h

Index: chrome/browser/ui/search/search_tab_helper.h
diff --git a/chrome/browser/ui/search/search_tab_helper.h b/chrome/browser/ui/search/search_tab_helper.h
index 095abf670c2c351d5cb85ec257f1a61b058f20a8..fea025a9980bc43cbb1cb78017c2ccd420d180ff 100644
--- a/chrome/browser/ui/search/search_tab_helper.h
+++ b/chrome/browser/ui/search/search_tab_helper.h
@@ -27,13 +27,13 @@ class WebContents;
 struct LoadCommittedDetails;
 }
 
+class BrowserWindow;
 class GURL;
 class InstantService;
 class InstantTabTest;
 class OmniboxView;
 class Profile;
 class SearchIPCRouterTest;
-class SearchTabHelperDelegate;
 
 // Per-tab search "helper".  Acts as the owner and controller of the tab's
 // search UI model.
@@ -75,14 +75,16 @@ class SearchTabHelper : public content::WebContentsObserver,
   void Submit(const base::string16& text,
               const EmbeddedSearchRequestParams& params);
 
+  // Called when the tab corresponding to |this| instance is attached to a
+  // browser window.
+  void OnTabAttachedToWindow(BrowserWindow* window);
+
   // Called when the tab corresponding to |this| instance is activated.
   void OnTabActivated();
 
   // Called when the tab corresponding to |this| instance is deactivated.
   void OnTabDeactivated();
 
-  void set_delegate(SearchTabHelperDelegate* delegate) { delegate_ = delegate; }
-
   SearchIPCRouter& ipc_router_for_testing() { return ipc_router_; }
 
  private:
@@ -176,9 +178,6 @@ class SearchTabHelper : public content::WebContentsObserver,
   // active tab is in mode SEARCH_SUGGESTIONS.
   bool IsInputInProgress() const;
 
-  // Returns the OmniboxView for |web_contents_| or NULL if not available.
-  OmniboxView* GetOmniboxView() const;
-
   const bool is_search_enabled_;
 
   // Model object for UI that cares about search state.
@@ -190,10 +189,7 @@ class SearchTabHelper : public content::WebContentsObserver,
 
   InstantService* instant_service_;
 
-  // Delegate for notifying our owner about the SearchTabHelper state. Not owned
-  // by us.
-  // NULL on iOS and Android because they don't use the Instant framework.
-  SearchTabHelperDelegate* delegate_;
+  OmniboxView* omnibox_view_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchTabHelper);
 };