about:omnibox - add "in keyword mode" checkbox

chrome/browser/ui/webui/omnibox/omnibox_ui_handler.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/webui/omnibox/omnibox_ui_handler.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 121 matching lines @@
     output->SetBoolean(item_prefix + ".from_previous", it->from_previous);
     for (AutocompleteMatch::AdditionalInfo::const_iterator j =
          it->additional_info.begin(); j != it->additional_info.end(); ++j) {
       output->SetString(item_prefix + ".additional_info." + j->first,
                         j->second);
     }
   }
   output->SetInteger(prefix + ".num_items", i);
 }
 
-void OmniboxUIHandler::StartOmniboxQuery(
-    const base::ListValue* three_element_input_string) {
-  DCHECK_EQ(3u, three_element_input_string->GetSize());
+void OmniboxUIHandler::StartOmniboxQuery(const base::ListValue* input) {
+  DCHECK_EQ(4u, input->GetSize());
   string16 input_string;
-  bool return_val = three_element_input_string->GetString(0, &input_string);
-  DCHECK(return_val);
-  bool prevent_inline_autocomplete;
-  return_val =
-      three_element_input_string->GetBoolean(1, &prevent_inline_autocomplete);
+  bool return_val = input->GetString(0, &input_string);
   DCHECK(return_val);
   int cursor_position_int;
-  return_val = three_element_input_string->GetInteger(2, &cursor_position_int);
+  return_val = input->GetInteger(1, &cursor_position_int);
   DCHECK(return_val);
   size_t cursor_position = cursor_position_int;
+  bool prevent_inline_autocomplete;
+  return_val = input->GetBoolean(2, &prevent_inline_autocomplete);
+  DCHECK(return_val);
+  bool prefer_keyword;
+  return_val = input->GetBoolean(3, &prefer_keyword);
+  DCHECK(return_val);
   string16 empty_string;
   // Reset the controller.  If we don't do this, then the
   // AutocompleteController might inappropriately set its |minimal_changes|
   // variable (or something else) and some providers will short-circuit
   // important logic and return stale results.  In short, we want the
   // actual results to not depend on the state of the previous request.
   ResetController();
   time_omnibox_started_ = base::Time::Now();
   controller_->Start(AutocompleteInput(
       input_string,
       cursor_position,
       empty_string,  // user's desired tld (top-level domain)
       prevent_inline_autocomplete,
-      false,  // no preferred keyword provider
+      prefer_keyword,
       true,  // allow exact keyword matches
       AutocompleteInput::ALL_MATCHES));  // want all matches
 }
 
 void OmniboxUIHandler::ResetController() {
   controller_.reset(new AutocompleteController(profile_, this,
       chrome::search::IsInstantExtendedAPIEnabled(profile_) ?
           AutocompleteClassifier::kInstantExtendedOmniboxProviders :
           AutocompleteClassifier::kDefaultOmniboxProviders));
 }