Clicks broken in NTP section of Search overlay

chrome/browser/ui/views/search_view_controller.h

Index: chrome/browser/ui/views/search_view_controller.h
diff --git a/chrome/browser/ui/views/search_view_controller.h b/chrome/browser/ui/views/search_view_controller.h
index 91cd38ae69ff3a4f9e2e347590393c5437446af1..b2ad9772fc14a95a0a3e01b74e0430af81a8d200 100644
--- a/chrome/browser/ui/views/search_view_controller.h
+++ b/chrome/browser/ui/views/search_view_controller.h
@@ -38,8 +38,7 @@ class SearchViewController
     : public chrome::search::SearchModelObserver,
       public ui::ImplicitAnimationObserver {
  public:
-  SearchViewController(content::BrowserContext* browser_context,
-                       ContentsContainer* contents_container);
+  explicit SearchViewController(ContentsContainer* contents_container);
   virtual ~SearchViewController();
 
   views::View* omnibox_popup_view_parent();
@@ -102,19 +101,12 @@ class SearchViewController
   // Invoked when the visibility of the omnibox popup changes.
   void PopupVisibilityChanged();
 
-  // Load the NTP from the associated |SearchTabHelper| if in NTP mode
-  // and the current |tab_contents_| has changed.
-  void MaybeLoadNTP();
-
   // Access active search model.
   chrome::search::SearchModel* search_model();
 
   // Access active web contents.
   content::WebContents* web_contents();
 
-  // The profile.  Weak.
-  content::BrowserContext* browser_context_;
-
   // Where the overlay is placed.  Weak.
   ContentsContainer* contents_container_;
 
@@ -158,7 +150,11 @@ class SearchViewController
   views::View* search_container_;
   views::View* ntp_view_;
   views::View* logo_view_;
+
+  // An alias to |contents_container_->active()|, but reparented within
+  // |ntp_view_| when in the NTP state.
   views::WebView* content_view_;
+
   OmniboxPopupViewParent* omnibox_popup_view_parent_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchViewController);