Converts SearchViewController to use live NTP content instead of placeholder

chrome/browser/ui/search/search_tab_helper.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/search/search_tab_helper.h"
 
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ skipping 42 matching lines @@
 
   if (model_->mode().is_ntp()) {
     if (edit_model->user_input_in_progress())
       model_->SetMode(Mode(Mode::MODE_SEARCH, true));
     return;
   }
 
   Mode::Type mode = Mode::MODE_DEFAULT;
   GURL url(web_contents()->GetURL());
   if (google_util::IsInstantExtendedAPIGoogleSearchUrl(url.spec()) ||
-      edit_model->has_focus()) {
+      (edit_model->has_focus() && edit_model->user_input_in_progress())) {

[dhollowa, 2012/07/20 00:34:09]

Until zero-suggest lands, the presence of the suggestions popup dictates whether
we're in SEARCH mode.  Kuan and I have a spreadsheet that clarifies all this. 
We'll be sending it out shortly.

     mode = Mode::MODE_SEARCH;
   }
   model_->SetMode(Mode(mode, true));
 }
 
 void SearchTabHelper::NavigateToPendingEntry(
     const GURL& url,
     content::NavigationController::ReloadType reload_type) {
   if (!is_search_enabled_)
     return;
@@ skipping 15 matching lines @@
   Mode::Type type = Mode::MODE_DEFAULT;
   if (IsNTP(url))
     type = Mode::MODE_NTP;
   else if (google_util::IsInstantExtendedAPIGoogleSearchUrl(url.spec()))
     type = Mode::MODE_SEARCH;
   model_->SetMode(Mode(type, true));
 }
 
 }  // namespace search
 }  // namespace chrome