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

Unified Diff: chromeos/printing/printer_translator.cc

Issue 2207053002: Revert of Define printer configuration objects for Chrome OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « chromeos/printing/printer_translator.h ('k') | chromeos/printing/printer_translator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/printing/printer_translator.cc
diff --git a/chromeos/printing/printer_translator.cc b/chromeos/printing/printer_translator.cc
deleted file mode 100644
index a28e5766f6daa6ce4564047827774be6f5a7cc49..0000000000000000000000000000000000000000
--- a/chromeos/printing/printer_translator.cc
+++ /dev/null
@@ -1,135 +0,0 @@
-// 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.
-
-#include "chromeos/printing/printer_translator.h"
-
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "base/memory/ptr_util.h"
-#include "base/values.h"
-#include "chromeos/printing/printer_configuration.h"
-
-using base::DictionaryValue;
-
-namespace chromeos {
-
-namespace {
-
-// ppd fields
-const char kPPDid[] = "id";
-const char kFileName[] = "file_name";
-const char kVersionNumber[] = "version_number";
-const char kFromQuirks[] = "from_quirks_server";
-
-// printer fields
-const char kDisplayName[] = "display_name";
-const char kDescription[] = "description";
-const char kManufacturer[] = "manufacturer";
-const char kModel[] = "model";
-const char kUri[] = "uri";
-const char kPPD[] = "ppd";
-const char kUUID[] = "uuid";
-
-std::unique_ptr<Printer::PPDFile> DictionaryToPPDFile(
- const base::DictionaryValue* value) {
- std::unique_ptr<Printer::PPDFile> ppd = base::MakeUnique<Printer::PPDFile>();
- int id = -1;
- value->GetInteger(kPPDid, &id);
- ppd->id = id;
-
- std::string file_name;
- if (value->GetString(kFileName, &file_name))
- ppd->file_name = file_name;
-
- int version_number = 0;
- if (value->GetInteger(kVersionNumber, &version_number))
- ppd->version_number = version_number;
-
- bool from_quirks;
- if (value->GetBoolean(kFromQuirks, &from_quirks))
- ppd->from_quirks_server = from_quirks;
-
- return ppd;
-}
-
-std::unique_ptr<base::DictionaryValue> PPDFileToDictionary(
- const Printer::PPDFile& ppd) {
- std::unique_ptr<base::DictionaryValue> dictionary =
- base::MakeUnique<base::DictionaryValue>();
- dictionary->SetInteger(kPPDid, ppd.id);
- dictionary->SetString(kFileName, ppd.file_name);
- dictionary->SetInteger(kVersionNumber, ppd.version_number);
- dictionary->SetBoolean(kFromQuirks, ppd.from_quirks_server);
- return dictionary;
-}
-
-} // namespace
-
-namespace printing {
-
-const char kPrinterId[] = "id";
-
-std::unique_ptr<Printer> PrefToPrinter(const DictionaryValue& value) {
- std::string id;
- if (!value.GetString(kPrinterId, &id)) {
- LOG(WARNING) << "Record id required";
- return nullptr;
- }
-
- std::unique_ptr<Printer> printer = base::MakeUnique<Printer>(id);
-
- std::string display_name;
- if (value.GetString(kDisplayName, &display_name))
- printer->set_display_name(display_name);
-
- std::string description;
- if (value.GetString(kDescription, &description))
- printer->set_description(description);
-
- std::string manufacturer;
- if (value.GetString(kManufacturer, &manufacturer))
- printer->set_manufacturer(manufacturer);
-
- std::string model;
- if (value.GetString(kModel, &model))
- printer->set_model(model);
-
- std::string uri;
- if (value.GetString(kUri, &uri))
- printer->set_uri(uri);
-
- std::string uuid;
- if (value.GetString(kUUID, &uuid))
- printer->set_uuid(uuid);
-
- const DictionaryValue* ppd;
- if (value.GetDictionary(kPPD, &ppd)) {
- printer->SetPPD(DictionaryToPPDFile(ppd));
- }
-
- return printer;
-}
-
-std::unique_ptr<base::DictionaryValue> PrinterToPref(const Printer& printer) {
- std::unique_ptr<DictionaryValue> dictionary =
- base::MakeUnique<base::DictionaryValue>();
- dictionary->SetString(kPrinterId, printer.id());
- dictionary->SetString(kDisplayName, printer.display_name());
- dictionary->SetString(kDescription, printer.description());
- dictionary->SetString(kManufacturer, printer.manufacturer());
- dictionary->SetString(kModel, printer.model());
- dictionary->SetString(kUri, printer.uri());
- dictionary->SetString(kUUID, printer.uuid());
-
- dictionary->Set(kPPD, PPDFileToDictionary(printer.ppd()));
-
- return dictionary;
-}
-
-} // namespace printing
-
-} // namespace chromeos
« no previous file with comments | « chromeos/printing/printer_translator.h ('k') | chromeos/printing/printer_translator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698