Omnibox: Combine Two Input Type Enums into One

chrome/browser/autocomplete/extension_app_provider.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/autocomplete/extension_app_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_ui_util.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
+#include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "ui/base/l10n/l10n_util.h"
 
 ExtensionAppProvider::ExtensionAppProvider(
     AutocompleteProviderListener* listener,
     Profile* profile)
@@ skipping 66 matching lines @@
       name_match_index != base::string16::npos ?
           app.name.length() : app.launch_url.length(),
       match.destination_url);
   return match;
 }
 
 void ExtensionAppProvider::Start(const AutocompleteInput& input,
                                  bool minimal_changes) {
   matches_.clear();
 
-  if ((input.type() == AutocompleteInput::INVALID) ||
-      (input.type() == AutocompleteInput::FORCED_QUERY))
+  if ((input.type() == metrics::OmniboxInputType::INVALID) ||
+      (input.type() == metrics::OmniboxInputType::FORCED_QUERY))
     return;
 
   if (input.text().empty())
     return;
 
   for (ExtensionApps::const_iterator app = extension_apps_.begin();
        app != extension_apps_.end(); ++app) {
     // See if the input matches this extension application.
     const base::string16& name = app->name;
     base::string16::const_iterator name_iter =
         std::search(name.begin(), name.end(),
                     input.text().begin(), input.text().end(),
                     base::CaseInsensitiveCompare<base::char16>());
     bool matches_name = name_iter != name.end();
     size_t name_match_index = matches_name ?
         static_cast<size_t>(name_iter - name.begin()) : base::string16::npos;
 
     bool matches_url = false;
     size_t url_match_index = base::string16::npos;
     if (app->should_match_against_launch_url) {
       const base::string16& url = app->launch_url;
       base::string16::const_iterator url_iter =
           std::search(url.begin(), url.end(),
                       input.text().begin(), input.text().end(),
                       base::CaseInsensitiveCompare<base::char16>());
-      matches_url = url_iter != url.end() &&
-          input.type() != AutocompleteInput::FORCED_QUERY;
+      matches_url = (url_iter != url.end()) &&
+          input.type() != metrics::OmniboxInputType::FORCED_QUERY;

[Peter Kasting, 2014/06/06 20:42:33]

Nit: Put parens on both subexprs if you're going to put them on one.

[Mark P, 2014/06/06 21:24:51]

Done.  (put parens on both)

       url_match_index = matches_url ?
           static_cast<size_t>(url_iter - url.begin()) : base::string16::npos;
     }
 
     if (matches_name || matches_url) {
       // We have a match, might be a partial match.
       matches_.push_back(CreateAutocompleteMatch(
           input, *app, name_match_index, url_match_index));
     }
   }
@@ skipping 36 matching lines @@
     extension_apps_.push_back(extension_app);
   }
 }
 
 void ExtensionAppProvider::Observe(int type,
                                    const content::NotificationSource& source,
                                    const content::NotificationDetails& details) {
   RefreshAppList();
 }
 
-int ExtensionAppProvider::CalculateRelevance(AutocompleteInput::Type type,
-                                             int input_length,
-                                             int target_length,
-                                             const GURL& url) {
+int ExtensionAppProvider::CalculateRelevance(
+    metrics::OmniboxInputType::Type type,
+    int input_length,
+    int target_length,
+    const GURL& url) {
   // If you update the algorithm here, please remember to update the tables in
   // autocomplete.h also.
   const int kMaxRelevance = 1425;
 
   if (input_length == target_length)
     return kMaxRelevance;
 
   // We give a boost proportionally based on how much of the input matches the
   // app name, up to a maximum close to 200 (we can be close to, but we'll never
   // reach 200 because the 100% match is taken care of above).
@@ skipping 12 matching lines @@
     history::URLRow info;
     url_db->GetRowForURL(url, &info);
     type_count_boost =
         400 * (1.0 - (std::pow(static_cast<double>(2), -info.typed_count())));
   }
   int relevance = 575 + static_cast<int>(type_count_boost) +
                         static_cast<int>(fraction_boost);
   DCHECK_LE(relevance, kMaxRelevance);
   return relevance;
 }