Omnibox: Combine Two Input Type Enums into One

chrome/browser/autocomplete/search_provider.h

 // 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.
 //
 // This file contains the Search autocomplete provider.  This provider is
 // responsible for all autocomplete entries that start with "Search <engine>
 // for ...", including searching for the current input string, search
 // history, and search suggestions.  An instance of it gets created and
 // managed by the autocomplete controller.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/autocomplete/base_search_provider.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/search_engines/template_url.h"
+#include "components/metrics/proto/omnibox_input_type.pb.h"
 
 class Profile;
 class SearchProviderTest;
 class TemplateURLService;
 
 namespace net {
 class URLFetcher;
 }
 
 // Autocomplete provider for searches and suggestions from a search engine.
@@ skipping 98 matching lines @@
                                  SuggestResults* suggest_results,
                                  NavigationResults* navigation_results);
 
   // Recalculates the match contents class of |results| to better display
   // against the current input and user's language.
   void UpdateMatchContentsClass(const base::string16& input_text,
                                 Results* results);
 
   // Calculates the relevance score for the keyword verbatim result (if the
   // input matches one of the profile's keyword).
-  static int CalculateRelevanceForKeywordVerbatim(AutocompleteInput::Type type,
-                                                  bool prefer_keyword);
+  static int CalculateRelevanceForKeywordVerbatim(
+      metrics::OmniboxInputType::Type type, bool prefer_keyword);

[Ilya Sherman, 2014/06/06 05:01:01]

nit: In header files, params should always be one per line if the entire method
signature does not fit on a single line.  You might want to run "git cl format"
over your CL (and double check that its output is reasonable).

[Mark P, 2014/06/06 20:22:51]

Done.
I ran it.  It didn't do much.  I accepted a suggestion or two.  Mostly it
disagrees with current code about how to format ternary operators.

 
   // AutocompleteProvider:
   virtual void Start(const AutocompleteInput& input,
                      bool minimal_changes) OVERRIDE;
 
   // BaseSearchProvider:
   virtual void SortResults(bool is_keyword,
                            const base::ListValue* relevances,
                            Results* results) OVERRIDE;
   virtual const TemplateURL* GetTemplateURL(bool is_keyword) const OVERRIDE;
@@ skipping 158 matching lines @@
   GURL current_page_url_;
 
   // Session token management.
   std::string current_token_;
   base::TimeTicks token_expiration_time_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_