Interpret '?' and Ctrl-K or Ctrl-E as putting omnibox in keyword search mode for Default Search Pro…

components/omnibox/browser/autocomplete_input.cc

 // Copyright 2014 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 "components/omnibox/browser/autocomplete_input.h"
 
 #include "base/macros.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 102 matching lines @@
   if (type_ == metrics::OmniboxInputType::INVALID)
     return;
 
   if (((type_ == metrics::OmniboxInputType::UNKNOWN) ||
        (type_ == metrics::OmniboxInputType::URL)) &&
       canonicalized_url.is_valid() &&
       (!canonicalized_url.IsStandard() || canonicalized_url.SchemeIsFile() ||
        canonicalized_url.SchemeIsFileSystem() ||
        !canonicalized_url.host().empty()))
     canonicalized_url_ = canonicalized_url;
-
-  size_t chars_removed = RemoveForcedQueryStringIfNecessary(type_, &text_);
-  AdjustCursorPositionIfNecessary(chars_removed, &cursor_position_);
-  if (chars_removed) {
-    // Remove spaces between opening question mark and first actual character.
-    base::string16 trimmed_text;
-    if ((base::TrimWhitespace(text_, base::TRIM_LEADING, &trimmed_text) &
-         base::TRIM_LEADING) != 0) {
-      AdjustCursorPositionIfNecessary(text_.length() - trimmed_text.length(),
-                                      &cursor_position_);
-      text_ = trimmed_text;
-    }
-  }
 }
 
 AutocompleteInput::AutocompleteInput(const AutocompleteInput& other) = default;
 
 AutocompleteInput::~AutocompleteInput() {
 }
 
 // static
-size_t AutocompleteInput::RemoveForcedQueryStringIfNecessary(
-    metrics::OmniboxInputType::Type type,
-    base::string16* text) {
-  if ((type != metrics::OmniboxInputType::FORCED_QUERY) || text->empty() ||
-      (*text)[0] != L'?')
-    return 0;
-  // Drop the leading '?'.
-  text->erase(0, 1);
-  return 1;
-}
-
-// static
 std::string AutocompleteInput::TypeToString(
     metrics::OmniboxInputType::Type type) {
   switch (type) {
     case metrics::OmniboxInputType::INVALID:      return "invalid";
     case metrics::OmniboxInputType::UNKNOWN:      return "unknown";
     case metrics::OmniboxInputType::DEPRECATED_REQUESTED_URL:
       return "deprecated-requested-url";
     case metrics::OmniboxInputType::URL:          return "url";
     case metrics::OmniboxInputType::QUERY:        return "query";
-    case metrics::OmniboxInputType::FORCED_QUERY: return "forced-query";
+    case metrics::OmniboxInputType::DEPRECATED_FORCED_QUERY:
+      return "deprecated-forced-query";
   }
   return std::string();
 }
 
 // static
 metrics::OmniboxInputType::Type AutocompleteInput::Parse(
     const base::string16& text,
     const std::string& desired_tld,
     const AutocompleteSchemeClassifier& scheme_classifier,
     url::Parsed* parts,
     base::string16* scheme,
     GURL* canonicalized_url) {
   size_t first_non_white = text.find_first_not_of(base::kWhitespaceUTF16, 0);
   if (first_non_white == base::string16::npos)
     return metrics::OmniboxInputType::INVALID;  // All whitespace.
 
-  if (text[first_non_white] == L'?') {
-    // If the first non-whitespace character is a '?', we magically treat this
-    // as a query.
-    return metrics::OmniboxInputType::FORCED_QUERY;
-  }
-
   // Ask our parsing back-end to help us understand what the user typed.  We
   // use the URLFixerUpper here because we want to be smart about what we
   // consider a scheme.  For example, we shouldn't consider www.google.com:80
   // to have a scheme.
   url::Parsed local_parts;
   if (!parts)
     parts = &local_parts;
   const base::string16 parsed_scheme(url_formatter::SegmentURL(text, parts));
   if (scheme)
     *scheme = parsed_scheme;
@@ skipping 370 matching lines @@
   parts_ = url::Parsed();
   scheme_.clear();
   canonicalized_url_ = GURL();
   prevent_inline_autocomplete_ = false;
   prefer_keyword_ = false;
   allow_exact_keyword_match_ = false;
   want_asynchronous_matches_ = true;
   from_omnibox_focus_ = false;
   terms_prefixed_by_http_or_https_.clear();
 }