SearchTabHelper: Find browser/window instead of having them passed in

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 fea025a9980bc43cbb1cb78017c2ccd420d180ff..e91f85d1f5004bd88949b6ba0491fcb49fb76d05 100644
--- a/chrome/browser/ui/search/search_tab_helper.h
+++ b/chrome/browser/ui/search/search_tab_helper.h
@@ -27,7 +27,6 @@ class WebContents;
 struct LoadCommittedDetails;
 }
 
-class BrowserWindow;
 class GURL;
 class InstantService;
 class InstantTabTest;
@@ -75,10 +74,6 @@ 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();
 
@@ -172,6 +167,8 @@ class SearchTabHelper : public content::WebContentsObserver,
   // received.
   void DetermineIfPageSupportsInstant();
 
+  OmniboxView* GetOmniboxView() const;

[Peter Kasting, 2017/03/17 21:16:13]

Nit: const methods should not return non-const pointers.

[Marc Treib, 2017/03/20 14:52:31]

Done (made const and non-const overloads).

+
   Profile* profile() const;
 
   // Returns whether input is in progress, i.e. if the omnibox has focus and the
@@ -189,8 +186,6 @@ class SearchTabHelper : public content::WebContentsObserver,
 
   InstantService* instant_service_;
 
-  OmniboxView* omnibox_view_;
-
   DISALLOW_COPY_AND_ASSIGN(SearchTabHelper);
 };