| Index: trunk/src/chrome/common/cloud_print/cloud_print_cdd_conversion.cc
|
| ===================================================================
|
| --- trunk/src/chrome/common/cloud_print/cloud_print_cdd_conversion.cc (revision 275710)
|
| +++ trunk/src/chrome/common/cloud_print/cloud_print_cdd_conversion.cc (working copy)
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "chrome/common/cloud_print/cloud_print_cdd_conversion.h"
|
|
|
| -#include "base/strings/string_number_conversions.h"
|
| #include "components/cloud_devices/common/printer_description.h"
|
| #include "printing/backend/print_backend.h"
|
|
|
| @@ -43,14 +42,11 @@
|
|
|
| ColorCapability color;
|
| if (semantic_info.color_default || semantic_info.color_changeable) {
|
| - Color standard_color(STANDARD_COLOR);
|
| - standard_color.vendor_id = base::IntToString(semantic_info.color_model);
|
| - color.AddDefaultOption(standard_color, semantic_info.color_default);
|
| + color.AddDefaultOption(Color(STANDARD_COLOR), semantic_info.color_default);
|
| }
|
| if (!semantic_info.color_default || semantic_info.color_changeable) {
|
| - Color standard_monochrome(STANDARD_MONOCHROME);
|
| - standard_monochrome.vendor_id = base::IntToString(semantic_info.bw_model);
|
| - color.AddDefaultOption(standard_monochrome, !semantic_info.color_default);
|
| + color.AddDefaultOption(Color(STANDARD_MONOCHROME),
|
| + !semantic_info.color_default);
|
| }
|
| color.SaveTo(&description);
|
|
|
|
|