| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_SERVICE_CLOUD_PRINT_PRINTER_INFO_H_ | 5 #ifndef CHROME_SERVICE_CLOUD_PRINT_PRINTER_INFO_H_ |
| 6 #define CHROME_SERVICE_CLOUD_PRINT_PRINTER_INFO_H_ | 6 #define CHROME_SERVICE_CLOUD_PRINT_PRINTER_INFO_H_ |
| 7 | 7 |
| 8 #include <map> |
| 8 #include <string> | 9 #include <string> |
| 9 #include <vector> | 10 #include <vector> |
| 10 | 11 |
| 11 #include "base/file_path.h" | 12 #include "base/file_path.h" |
| 12 | 13 |
| 13 // This is the interface for platform-specific code for cloud print | 14 // This is the interface for platform-specific code for cloud print |
| 14 namespace cloud_print { | 15 namespace cloud_print { |
| 15 | 16 |
| 16 typedef int PlatformJobId; | 17 typedef int PlatformJobId; |
| 17 | 18 |
| 18 struct PrinterBasicInfo { | 19 struct PrinterBasicInfo { |
| 19 std::string printer_name; | 20 std::string printer_name; |
| 20 std::string printer_description; | 21 std::string printer_description; |
| 21 int printer_status; | 22 int printer_status; |
| 23 std::map<std::string, std::string> options; |
| 22 PrinterBasicInfo() : printer_status(0) { | 24 PrinterBasicInfo() : printer_status(0) { |
| 23 } | 25 } |
| 24 }; | 26 }; |
| 25 | 27 |
| 26 typedef std::vector<PrinterBasicInfo> PrinterList; | 28 typedef std::vector<PrinterBasicInfo> PrinterList; |
| 27 | 29 |
| 28 struct PrinterCapsAndDefaults { | 30 struct PrinterCapsAndDefaults { |
| 29 std::string printer_capabilities; | 31 std::string printer_capabilities; |
| 30 std::string caps_mime_type; | 32 std::string caps_mime_type; |
| 31 std::string printer_defaults; | 33 std::string printer_defaults; |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 // This typedef is to workaround the issue with certain versions of | 118 // This typedef is to workaround the issue with certain versions of |
| 117 // Visual Studio where it gets confused between multiple Delegate | 119 // Visual Studio where it gets confused between multiple Delegate |
| 118 // classes and gives a C2500 error. (I saw this error on the try bots - | 120 // classes and gives a C2500 error. (I saw this error on the try bots - |
| 119 // the workaround was not needed for my machine). | 121 // the workaround was not needed for my machine). |
| 120 typedef PrinterChangeNotifier::Delegate PrinterChangeNotifierDelegate; | 122 typedef PrinterChangeNotifier::Delegate PrinterChangeNotifierDelegate; |
| 121 | 123 |
| 122 } // namespace cloud_print | 124 } // namespace cloud_print |
| 123 | 125 |
| 124 #endif // CHROME_SERVICE_CLOUD_PRINT_PRINTER_INFO_H_ | 126 #endif // CHROME_SERVICE_CLOUD_PRINT_PRINTER_INFO_H_ |
| 125 | 127 |
| OLD | NEW |