Add vendor id and custom display name to media selection

components/cloud_devices/common/printer_description.cc

 // 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.
 
 #include "components/cloud_devices/common/printer_description.h"
 
 #include <algorithm>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 442 matching lines @@
 }
 
 Media::Media(MediaType type, int32 width_um, int32 height_um)
     : type(type),
       width_um(width_um),
       height_um(height_um),
       is_continuous_feed(width_um <= 0 || height_um <= 0) {
 }
 
 Media::Media(const std::string& custom_display_name,
+             const std::string& vendor_id,
              int32 width_um,
              int32 height_um)
     : type(CUSTOM_MEDIA),
       width_um(width_um),
       height_um(height_um),
       is_continuous_feed(width_um <= 0 || height_um <= 0),
-      custom_display_name(custom_display_name) {
+      custom_display_name(custom_display_name),
+      vendor_id(vendor_id) {
 }
 
 bool Media::MatchBySize() {
   const MediaDefinition* media = FindMediaBySize(width_um, height_um);
   if (!media)
     return false;
   type = media->id;
-  custom_display_name.clear();
   return true;
 }
 
 bool Media::IsValid() const {
   if (is_continuous_feed) {
     if (width_um <= 0 && height_um <= 0)
       return false;
   } else {
     if (width_um <= 0 || height_um <= 0)
       return false;
@@ skipping 263 matching lines @@
     std::string type_str;
     if (dict.GetString(kKeyName, &type_str)) {
       if (!TypeFromString(kMediaDefinitions, type_str, &option->type))
         return false;
     }
 
     dict.GetInteger(kMediaWidth, &option->width_um);
     dict.GetInteger(kMediaHeight, &option->height_um);
     dict.GetBoolean(kMediaIsContinuous, &option->is_continuous_feed);
     dict.GetString(kCustomName, &option->custom_display_name);
+    dict.GetString(kKeyVendorId, &option->vendor_id);
     return true;
   }
 
   static void Save(const Media& option, base::DictionaryValue* dict) {
-    if (option.type != CUSTOM_MEDIA)
-      dict->SetString(kKeyName, TypeToString(kMediaDefinitions, option.type));
+    dict->SetString(kKeyName, TypeToString(kMediaDefinitions, option.type));

[Vitaly Buka (NO REVIEWS), 2014/06/12 00:43:24]

if (option.type != CUSTOM_MEDIA)

[Aleksey Shlyapnikov, 2014/06/12 00:50:05]

Done.

     if (!option.custom_display_name.empty() || option.type == CUSTOM_MEDIA)
       dict->SetString(kCustomName, option.custom_display_name);
+    if (!option.vendor_id.empty())
+      dict->SetString(kKeyVendorId, option.vendor_id);
     if (option.width_um > 0)
       dict->SetInteger(kMediaWidth, option.width_um);
     if (option.height_um > 0)
       dict->SetInteger(kMediaHeight, option.height_um);
     if (option.is_continuous_feed)
       dict->SetBoolean(kMediaIsContinuous, true);
   }
 };
 
 class CollateTraits : public NoValueValidation,
@@ skipping 49 matching lines @@
 template class TicketItem<Margins, MarginsTraits>;
 template class TicketItem<Dpi, DpiTraits>;
 template class TicketItem<FitToPageType, FitToPageTraits>;
 template class TicketItem<Media, MediaTraits>;
 template class TicketItem<int32, CopiesTraits>;
 template class TicketItem<PageRange, PageRangeTraits>;
 template class TicketItem<bool, CollateTraits>;
 template class TicketItem<bool, ReverseTraits>;
 
 }  // namespace cloud_devices