Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: trunk/src/chrome/common/cloud_print/cloud_print_cdd_conversion.cc

Issue 319373004: Revert 275646 "Generalize printer color model handling, get rid ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
« no previous file with comments | « trunk/src/chrome/common/chrome_utility_messages.h ('k') | trunk/src/chrome/test/data/webui/print_preview.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698