Clicks broken in NTP section of Search overlay

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 1916 matching lines @@
   AddChildView(infobar_container_);
 
   contents_container_ = new views::WebView(browser_->profile());
   contents_container_->set_id(VIEW_ID_TAB_CONTAINER);
   contents_ = new ContentsContainer(contents_container_);
 
   views::View* omnibox_popup_view_parent = NULL;
   // SearchViewController doesn't work on windows yet.
 #if defined(USE_AURA)
   if (chrome::search::IsInstantExtendedAPIEnabled(browser_->profile())) {
-    search_view_controller_.reset(
-        new SearchViewController(browser_->profile(), contents_));
+    search_view_controller_.reset(new SearchViewController(contents_));
     omnibox_popup_view_parent =
         search_view_controller_->omnibox_popup_view_parent();
   }
 #endif
 
   toolbar_ = new ToolbarView(browser_.get());
   AddChildView(toolbar_);
   toolbar_->Init(this, omnibox_popup_view_parent);
 
 #if defined(USE_AURA)
@@ skipping 503 matching lines @@
   DCHECK(new_contents);
   bool change_tab_contents =
       contents_container_->web_contents() != new_contents->web_contents();
 
   // Update various elements that are interested in knowing the current
   // WebContents.
 
   // When we toggle the NTP floating bookmarks bar and/or the info bar,
   // we don't want any WebContents to be attached, so that we
   // avoid an unnecessary resize and re-layout of a WebContents.
+  // This also applies to the |search_view_controller_| logic, as it can
+  // reparent the |contents_container_|.
   if (change_tab_contents)
     contents_container_->SetWebContents(NULL);
   infobar_container_->ChangeTabContents(new_contents->infobar_tab_helper());
   if (bookmark_bar_view_.get()) {
     bookmark_bar_view_->SetBookmarkBarState(
         browser_->bookmark_bar_state(),
         BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
   }
   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
 
+  if (change_tab_contents)
+    contents_container_->SetWebContents(new_contents->web_contents());
+
   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();
@@ skipping 94 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;
 }