Cleanup: Remove SearchTabHelperDelegate

chrome/browser/ui/browser.cc

 // 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.
 
 #include "chrome/browser/ui/browser.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 948 matching lines @@
 void Browser::TabInsertedAt(TabStripModel* tab_strip_model,
                             WebContents* contents,
                             int index,
                             bool foreground) {
   SetAsDelegate(contents, true);
 
   SessionTabHelper* session_tab_helper =
       SessionTabHelper::FromWebContents(contents);
   session_tab_helper->SetWindowID(session_id());
 
+  SearchTabHelper* search_tab_helper =
+      SearchTabHelper::FromWebContents(contents);

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

Nit: Or could inline into next line

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

Sure, done.
(I was copying the style from SessionTabHelper above; I've inlined that too.)

+  search_tab_helper->SetOmniboxView(
+      window_->GetLocationBar()->GetOmniboxView());
+
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TAB_PARENTED,
       content::Source<content::WebContents>(contents),
       content::NotificationService::NoDetails());
 
   SyncHistoryWithTabs(index);
 
   // Make sure the loading state is updated correctly, otherwise the throbber
   // won't start if the page is loading.
   LoadingStateChanged(contents, true);
@@ skipping 997 matching lines @@
 
 bool Browser::CanReloadContents(content::WebContents* web_contents) const {
   return chrome::CanReload(this);
 }
 
 bool Browser::CanSaveContents(content::WebContents* web_contents) const {
   return chrome::CanSavePage(this);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// Browser, SearchTabHelperDelegate implementation:
-
-OmniboxView* Browser::GetOmniboxView() {
-  return window_->GetLocationBar()->GetOmniboxView();
-}
-
-///////////////////////////////////////////////////////////////////////////////
 // Browser, web_modal::WebContentsModalDialogManagerDelegate implementation:
 
 void Browser::SetWebContentsBlocked(content::WebContents* web_contents,
                                     bool blocked) {
   int index = tab_strip_model_->GetIndexOfWebContents(web_contents);
   if (index == TabStripModel::kNoTab) {
     NOTREACHED();
     return;
   }
   tab_strip_model_->SetTabBlocked(index, blocked);
@@ skipping 419 matching lines @@
 void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
   Browser* delegate = set_delegate ? this : NULL;
   // WebContents...
   web_contents->SetDelegate(delegate);
 
   // ...and all the helpers.
   BookmarkTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
   WebContentsModalDialogManager::FromWebContents(web_contents)->
       SetDelegate(delegate);
   CoreTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
-  SearchTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
   translate::ContentTranslateDriver& content_translate_driver =
       ChromeTranslateClient::FromWebContents(web_contents)->translate_driver();
   if (delegate) {
     zoom::ZoomController::FromWebContents(web_contents)->AddObserver(this);
     content_translate_driver.AddObserver(this);
   } else {
     zoom::ZoomController::FromWebContents(web_contents)->RemoveObserver(this);
     content_translate_driver.RemoveObserver(this);
   }
 }
@@ skipping 228 matching lines @@
     // new window later, thus we need to navigate the window now.
     if (contents) {
       contents->web_contents()->GetController().LoadURL(
           target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK,
           std::string());  // No extra headers.
     }
   }
 
   return contents != NULL;
 }