Remove SearchTabHelperDelegate::OnWebContentsInstantSupportDisabled

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 1951 matching lines @@
   return chrome::CanReload(this);
 }
 
 bool Browser::CanSaveContents(content::WebContents* web_contents) const {
   return chrome::CanSavePage(this);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, SearchTabHelperDelegate implementation:
 
-void Browser::OnWebContentsInstantSupportDisabled(
-    const content::WebContents* web_contents) {
-  DCHECK(web_contents);
-  if (tab_strip_model_->GetActiveWebContents() == web_contents)
-    UpdateToolbar(false);
-}
-
 OmniboxView* Browser::GetOmniboxView() {

[Marc Treib, 2017/03/08 13:34:58]

This is now the only method left in SearchTabHelperDelegate. I think we can
remove the delegate, and instead just pass the OmniboxView* to the
SearchTabHelper directly, e.g. in Browser::TabInsertedAt. (That assumes that the
OmniboxView* won't change during the lifetime of the tab, which I think is
safe.)

If you agree, I'll do that in a follow-up (or in this CL, whichever you prefer).

[Peter Kasting, 2017/03/09 06:12:24]

I'd worry about the case of dragging a tab from one window to another.  An
OmniboxView is tied to a browser window, so if you dragged a tab from one window
to a different one, you'd want to make sure you weren't still pointing at the
omnibox from the previous window.

If in that case things get updated correctly, then you're welcome to make the
change in a follow-up CL.

[Marc Treib, 2017/03/09 10:04:47]

Thanks, I didn't think about that case! I'll investigate and then possibly send
that follow-up.

   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) {
@@ skipping 672 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;
 }