Move web_contents from SearchViewController to SearchTabHelper

chrome/browser/ui/views/search_view_controller.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/search_view_controller.h"
 
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/search/search_types.h"
 #include "chrome/browser/ui/search/search_ui.h"
@@ skipping 322 matching lines @@
       } else {
         // Only enter into MODE_SEARCH if the omnibox is visible.
         if (omnibox_popup_view_parent_->is_child_visible())
           new_state = STATE_SEARCH;
         else
           new_state = STATE_NOT_VISIBLE;
       }
       break;
   }
   SetState(new_state);
+  MaybeLoadNTP();
 }
 
 void SearchViewController::SetState(State state) {
   if (state_ == state)
     return;
 
   State old_state = state_;
   state_ = state;
   switch (state_) {
     case STATE_NOT_VISIBLE:
@@ skipping 97 matching lines @@
 
 void SearchViewController::DestroyViews() {
   if (!search_container_)
     return;
 
   // We persist the parent of the omnibox so that we don't have to inject a new
   // parent into ToolbarView.
   omnibox_popup_view_parent_->parent()->RemoveChildView(
       omnibox_popup_view_parent_);
 
+  if (content_view_)
+    content_view_->SetWebContents(NULL);
+
   contents_container_->SetOverlay(NULL);
   delete search_container_;
   search_container_ = NULL;
   ntp_view_ = NULL;
   logo_view_ = NULL;
   content_view_ = NULL;
 
   state_ = STATE_NOT_VISIBLE;
 }
 
 void SearchViewController::PopupVisibilityChanged() {
   // Don't do anything while animating if the child is visible. Otherwise we'll
   // prematurely cancel the animation.
   if (state_ != STATE_ANIMATING ||
       !omnibox_popup_view_parent_->is_child_visible()) {
     UpdateState();
   }
 }
 
+void SearchViewController::MaybeLoadNTP() {
+  if (state_ != STATE_NTP || !content_view_)
+    return;
+
+  content_view_->SetWebContents(
+      tab_contents_->search_tab_helper()->GetNTPWebContents());
+}
+
 chrome::search::SearchModel* SearchViewController::search_model() {
   return tab_contents_ ? tab_contents_->search_tab_helper()->model() : NULL;
 }
 
 content::WebContents* SearchViewController::web_contents() {
   return tab_contents_ ? tab_contents_->web_contents() : NULL;
 }