Introduce the field make_and_model for synced printers.

chromeos/printing/printer_configuration.h

 // Copyright 2016 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 CHROMEOS_PRINTING_PRINTER_CONFIGURATION_H_
 #define CHROMEOS_PRINTING_PRINTER_CONFIGURATION_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 69 matching lines @@
   const std::string& display_name() const { return display_name_; }
   void set_display_name(const std::string& display_name) {
     display_name_ = display_name;
   }
 
   const std::string& description() const { return description_; }
   void set_description(const std::string& description) {
     description_ = description;
   }
 
+  // Returns the |manufacturer| of the printer.
+  // DEPRECATED(skau@chromium.org): Use make_and_model() instead.
   const std::string& manufacturer() const { return manufacturer_; }
   void set_manufacturer(const std::string& manufacturer) {
     manufacturer_ = manufacturer;
   }
 
+  // Returns the |model| of the printer.
+  // DEPRECATED(skau@chromium.org): Use make_and_model() instead.
   const std::string& model() const { return model_; }
   void set_model(const std::string& model) { model_ = model; }
 
+  const std::string& make_and_model() const { return make_and_model_; }
+  void set_make_and_model(const std::string& make_and_model) {
+    make_and_model_ = make_and_model;
+  }
+
   const std::string& uri() const { return uri_; }
   void set_uri(const std::string& uri) { uri_ = uri; }
 
   const PpdReference& ppd_reference() const { return ppd_reference_; }
   PpdReference* mutable_ppd_reference() { return &ppd_reference_; }
 
   const std::string& uuid() const { return uuid_; }
   void set_uuid(const std::string& uuid) { uuid_ = uuid; }
 
   // Returns true if the printer should be automatically configured using
@@ skipping 15 matching lines @@
   // Globally unique identifier. Empty indicates a new printer.
   std::string id_;
 
   // User defined string for printer identification.
   std::string display_name_;
 
   // User defined string for additional printer information.
   std::string description_;
 
   // The manufacturer of the printer, e.g. HP
+  // DEPRECATED(skau@chromium.org): Migrating to make_and_model.  This is kept
+  // for backward compatibility until migration is complete.
   std::string manufacturer_;
 
   // The model of the printer, e.g. OfficeJet 415
+  // DEPRECATED(skau@chromium.org): Migrating to make_and_model.  This is kept
+  // for backward compatibility until migration is complete.
   std::string model_;
 
+  // The manufactuer and model of the printer in one string. e.g. HP OfficeJet
+  // 415.
+  std::string make_and_model_;
+
   // The full path for the printer. Suitable for configuration in CUPS.
   // Contains protocol, hostname, port, and queue.
   std::string uri_;
 
   // How to find the associated postscript printer description.
   PpdReference ppd_reference_;
 
   // The UUID from an autoconf protocol for deduplication. Could be empty.
   std::string uuid_;
 
   // The datastore which holds this printer.
   Source source_;
 
   // Timestamp of most recent change.
   base::Time last_updated_;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_PRINTING_PRINTER_CONFIGURATION_H_