Omnibox - Strip Extra Whitespace from Custom Search Engine Names

components/search_engines/template_url_data.h

 // 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.
 
 #ifndef COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_DATA_H_
 #define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_DATA_H_
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "components/search_engines/template_url_id.h"
 #include "url/gurl.h"
 
 // The data for the TemplateURL.  Separating this into its own class allows most
 // users to do SSA-style usage of TemplateURL: construct a TemplateURLData with
 // whatever fields are desired, then create an immutable TemplateURL from it.
 struct TemplateURLData {
   TemplateURLData();
   ~TemplateURLData();
 
   // A short description of the template. This is the name we show to the user
   // in various places that use TemplateURLs. For example, the location bar
   // shows this when the user selects a substituting match.
-  base::string16 short_name;
+  void SetShortName(const base::string16& shortname);

[Peter Kasting, 2015/05/11 23:53:17]

Nit: Call the arg |short_name|

[Mark P, 2015/05/12 04:37:38]

Done.

+  const base::string16& short_name() const { return short_name_; }
 
   // The shortcut for this TemplateURL.  |keyword| must be non-empty.
   void SetKeyword(const base::string16& keyword);
   const base::string16& keyword() const { return keyword_; }
 
   // The raw URL for the TemplateURL, which may not be valid as-is (e.g. because
   // it requires substitutions first).  This must be non-empty.
   void SetURL(const std::string& url);
   const std::string& url() const { return url_; }
 
@@ skipping 71 matching lines @@
   // search terms from a URL.
   std::vector<std::string> alternate_urls;
 
   // A parameter that, if present in the query or ref parameters of a search_url
   // or instant_url, causes Chrome to replace the URL with the search term.
   std::string search_terms_replacement_key;
 
  private:
   // Private so we can enforce using the setters and thus enforce that these
   // fields are never empty.
+  base::string16 short_name_;
   base::string16 keyword_;
   std::string url_;
 };
 
 #endif  // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_DATA_H_