Move web_contents from SearchViewController to SearchTabHelper

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright (c) 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/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 2477 matching lines @@
   UpdateUIForContents(new_contents);
   if (change_tab_contents)
     contents_container_->SetWebContents(new_contents->web_contents());
 
 #if defined(USE_AURA)
   // |change_tab_contents| can mean same WebContents but different TabContents,
   // so let SearchViewController decide how it would handle |new_contents|.
   if (search_view_controller_.get())
     search_view_controller_->SetTabContents(new_contents);
 #endif
-  RestackLocationBarContainer();
 
   UpdateDevToolsForContents(new_contents);
   if (!browser_->tab_strip_model()->closing_all() && GetWidget()->IsActive() &&
       GetWidget()->IsVisible()) {
     // We only restore focus if our window is visible, to avoid invoking blur
     // handlers when we are eventually shown.
     new_contents->web_contents()->GetView()->RestoreFocus();
   }
 
   // Update all the UI bits.
   UpdateTitleBar();
+
+  // Restacking needs to happen after other UI updates. This restores special
+  // "widget" stacking that governs the SearchViewController's NTP "content"
+  // area.
+  RestackLocationBarContainer();
+
   // No need to update Toolbar because it's already updated in
   // browser.cc.
 }
 
 gfx::Size BrowserView::GetResizeCornerSize() const {
   return ResizeCorner::GetSize();
 }
 
 void BrowserView::CreateLauncherIcon() {
 #if defined(USE_ASH)
@@ skipping 78 matching lines @@
   if (contents && contents->GetContentNativeView() &&
       contents->GetContentNativeView()->HasFocus()) {
     (contents->GetRenderViewHost()->*method)();
     return true;
   }
 #elif defined(OS_WIN)
   // TODO(yusukes): Support non-Aura Windows.
 #endif
   return false;
 }