Send onsubmit query down to the instant extended overlay page when a navigation is performed from t…

chrome/renderer/searchbox/searchbox.cc

 // Copyright 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/renderer/searchbox/searchbox.h"
 
 #include "base/metrics/field_trial.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 212 matching lines @@
   selection_start_ = selection_start;
   selection_end_ = selection_end;
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     DVLOG(1) << render_view() << " OnChange";
     extensions_v8::SearchBoxExtension::DispatchChange(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
 void SearchBox::OnSubmit(const string16& query) {
-  query_ = query;
-  verbatim_ = true;
-  selection_start_ = selection_end_ = query_.size();
+  // Submit() is called when the user hits Enter to commit the omnibox text.
+  // If |query| is non-blank, the user committed a search. If it's blank, the
+  // omnibox text was a URL, and the user is navigating to it, in which case
+  // we shouldn't update the |query_| or associated state.
+  if (!query.empty()) {
+    query_ = query;
+    verbatim_ = true;
+    selection_start_ = selection_end_ = query_.size();
+  }
+
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     DVLOG(1) << render_view() << " OnSubmit";
     extensions_v8::SearchBoxExtension::DispatchSubmit(
         render_view()->GetWebView()->mainFrame());
   }
-  Reset();
+
+  if (!query.empty())
+    Reset();
 }
 
 void SearchBox::OnCancel(const string16& query) {
   query_ = query;
   verbatim_ = true;
   selection_start_ = selection_end_ = query_.size();
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     DVLOG(1) << render_view() << " OnCancel";
     extensions_v8::SearchBoxExtension::DispatchCancel(
         render_view()->GetWebView()->mainFrame());
@@ skipping 249 matching lines @@
   std::string trial_flags =
       base::FieldTrialList::FindFullName(kInstantExtendedFieldTrialName);
   std::vector<std::string> flags;
   Tokenize(trial_flags, " ", &flags);
   for (size_t i = 0; i < flags.size(); ++i) {
     if (flags[i] == kIframesEnabledFlagWithValue)
       return true;
   }
   return false;
 }