Import keywords for search engines imported from Firefox

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>
 
@@ skipping 10 matching lines @@
   ~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;
 
   // The shortcut for this TemplateURL.  |keyword| must be non-empty.
   void SetKeyword(const base::string16& keyword);
   const base::string16& keyword() const { return keyword_; }
+  bool has_custom_keyword;

[Peter Kasting, 2014/07/29 18:33:31]

I'd like to not introduce this to TemplateURLData.  It doesn't make sense
outside the very narrow context of the importer.  Instead, track this in the
TemplateURLParsingContext.

[Nikhil, 2014/07/30 07:31:29]

Done.

 
   // 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_; }
 
   // Optional additional raw URLs.
   std::string suggestions_url;
   std::string instant_url;
   std::string image_url;
@@ skipping 72 matching lines @@
   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 keyword_;
   std::string url_;
 };
 
 #endif  // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_DATA_H_