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

chrome/browser/ui/search/search_tab_helper.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_SEARCH_TAB_HELPER_H_
 #define CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
 
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "chrome/browser/search/instant_service_observer.h"
 #include "chrome/browser/ui/search/search_ipc_router.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/common/search/instant_types.h"
 #include "chrome/common/search/ntp_logging_events.h"
 #include "components/ntp_tiles/ntp_tile_source.h"
 #include "components/omnibox/common/omnibox_focus_state.h"
 #include "content/public/browser/reload_type.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
 namespace content {
 class WebContents;
 struct LoadCommittedDetails;
 }
 
-class BrowserWindow;
 class GURL;
 class InstantService;
 class InstantTabTest;
 class OmniboxView;
 class Profile;
 class SearchIPCRouterTest;
 
 // Per-tab search "helper".  Acts as the owner and controller of the tab's
 // search UI model.
 //
@@ skipping 27 matching lines @@
   // the notification system and shouldn't call this method.
   void NavigationEntryUpdated();
 
   // Sends the current SearchProvider suggestion to the Instant page if any.
   void SetSuggestionToPrefetch(const InstantSuggestion& suggestion);
 
   // Tells the page that the user pressed Enter in the omnibox.
   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();
 
   SearchIPCRouter& ipc_router_for_testing() { return ipc_router_; }
 
  private:
   friend class content::WebContentsUserData<SearchTabHelper>;
@@ skipping 73 matching lines @@
   // Sets the mode of the model based on the current URL of web_contents().
   // Only updates the origin part of the mode if |update_origin| is true,
   // otherwise keeps the current origin.
   void UpdateMode(bool update_origin);
 
   // Tells the renderer to determine if the page supports the Instant API, which
   // results in a call to OnInstantSupportDetermined() when the reply is
   // 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
   // active tab is in mode SEARCH_SUGGESTIONS.
   bool IsInputInProgress() const;
 
   const bool is_search_enabled_;
 
   // Model object for UI that cares about search state.
   SearchModel model_;
 
   content::WebContents* web_contents_;
 
   SearchIPCRouter ipc_router_;
 
   InstantService* instant_service_;
 
-  OmniboxView* omnibox_view_;
-
   DISALLOW_COPY_AND_ASSIGN(SearchTabHelper);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_