Cleanup: Remove SearchTabHelperDelegate

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"
@@ skipping 15 matching lines @@
 class WebContents;
 struct LoadCommittedDetails;
 }
 
 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.
 //
 // When the page is finished loading, SearchTabHelper determines the instant
 // support for the page. When a navigation entry is committed (except for
 // in-page navigations), SearchTabHelper resets the instant support state to
 // INSTANT_SUPPORT_UNKNOWN and cause support to be determined again.
 class SearchTabHelper : public content::WebContentsObserver,
                         public content::WebContentsUserData<SearchTabHelper>,
@@ skipping 27 matching lines @@
   // 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 activated.
   void OnTabActivated();
 
   // Called when the tab corresponding to |this| instance is deactivated.
   void OnTabDeactivated();
 
-  void set_delegate(SearchTabHelperDelegate* delegate) { delegate_ = delegate; }
+  // Called when the tab corresponding to |this| instance is attached to a
+  // browser window.
+  void SetOmniboxView(OmniboxView* omnibox_view);

[Peter Kasting, 2017/03/10 10:19:57]

Nit: The comment suggests that this would be named something like
OnTabAttachedToWindow().  It's slightly odd for the comments on this function to
document something seemingly-unrelated about what the caller does with it.

I wonder if this shouldn't be OnTabInserted() (since that's what the browser
function calling it is).  I also wonder if it should pull the omnibox view from
the browser (rather than having it provided), but that's mostly for API
cleanliness/parallelism with the above methods.

[Marc Treib, 2017/03/10 11:30:03]

Indeed, that seems much more consistent with the other methods. Thanks!

I've made it "OnTabAttachedToWindow(BrowerWindow*)"; IMO "OnTabInserted" lacks
some context here (inserted into what?).

 
   SearchIPCRouter& ipc_router_for_testing() { return ipc_router_; }
 
  private:
   friend class content::WebContentsUserData<SearchTabHelper>;
   friend class SearchIPCRouterPolicyTest;
   friend class SearchIPCRouterTest;
 
   FRIEND_TEST_ALL_PREFIXES(SearchTabHelperTest,
                            DetermineIfPageSupportsInstant_Local);
@@ skipping 74 matching lines @@
   // results in a call to OnInstantSupportDetermined() when the reply is
   // received.
   void DetermineIfPageSupportsInstant();
 
   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;
 
-  // 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.
   SearchModel model_;
 
   content::WebContents* web_contents_;
 
   SearchIPCRouter ipc_router_;
 
   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);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_