Index: chrome/common/cloud_print/cloud_print_constants.cc |
diff --git a/chrome/service/cloud_print/cloud_print_consts.cc b/chrome/common/cloud_print/cloud_print_constants.cc |
similarity index 59% |
copy from chrome/service/cloud_print/cloud_print_consts.cc |
copy to chrome/common/cloud_print/cloud_print_constants.cc |
index 5c83d1777fccddcf961074af250988ffd527ce26..95d1e6599c44424d32cf4df8da19802eab9142a1 100644 |
--- a/chrome/service/cloud_print/cloud_print_consts.cc |
+++ b/chrome/common/cloud_print/cloud_print_constants.cc |
@@ -1,10 +1,16 @@ |
-// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
+// Copyright 2012 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. |
-// Constant defines used in the cloud print proxy code |
+#include "chrome/common/cloud_print/cloud_print_constants.h" |
-#include "chrome/service/cloud_print/cloud_print_consts.h" |
+namespace cloud_print { |
+ |
+const char kCloudPrintUserAgent[] = "GoogleCloudPrintProxy"; |
msw
2012/11/17 00:22:30
This constant is defined in both files :(
Chen Yu
2012/11/26 12:07:06
Done.
|
+const char kChromeCloudPrintProxyHeader[] = "X-CloudPrint-Proxy: Chrome"; |
+const char kCloudPrintGaiaServiceId[] = "cloudprint"; |
+const char kProxyAuthUserAgent[] = "ChromiumBrowser"; |
msw
2012/11/17 00:22:30
This constant is defined in both files :(
Chen Yu
2012/11/26 12:07:06
Done.
|
+const char kCloudPrintPushNotificationsSource[] = "cloudprint.google.com"; |
const char kProxyIdValue[] = "proxy"; |
const char kPrinterNameValue[] = "printer"; |
@@ -16,48 +22,29 @@ const char kPrinterTagValue[] = "tag"; |
const char kPrinterRemoveTagValue[] = "remove_tag"; |
const char kMessageTextValue[] = "message"; |
-// Values in the respone JSON from the cloud print server |
+const char kPrintSystemFailedMessageId[] = "printsystemfail"; |
+const char kGetPrinterCapsFailedMessageId[] = "getprncapsfail"; |
+const char kEnumPrintersFailedMessageId[] = "enumfail"; |
+const char kZombiePrinterMessageId[] = "zombieprinter"; |
+ |
+const char kSuccessValue[] = "success"; |
const char kNameValue[] = "name"; |
const char kIdValue[] = "id"; |
const char kTicketUrlValue[] = "ticketUrl"; |
const char kFileUrlValue[] = "fileUrl"; |
+const char kPrinterListValue[] = "printers"; |
const char kJobListValue[] = "jobs"; |
const char kTitleValue[] = "title"; |
const char kPrinterCapsHashValue[] = "capsHash"; |
const char kTagsValue[] = "tags"; |
const char kXMPPJidValue[] = "xmpp_jid"; |
const char kOAuthCodeValue[] = "authorization_code"; |
+const char kCreateTimeValue[] = "createTime"; |
+const char kPrinterTypeValue[] = "type"; |
-const char kProxyTagPrefix[] = "__cp__"; |
-const char kTagsHashTagName[] = "__cp__tagshash"; |
-const char kTagDryRunFlag[] = "__cp__dry_run"; |
-// Don't need prefixes. They will be added on submit. |
const char kChromeVersionTagName[] = "chrome_version"; |
const char kSystemNameTagName[] = "system_name"; |
const char kSystemVersionTagName[] = "system_version"; |
-extern const char kChromeVersionTagName[]; |
-extern const char kOsTagName[]; |
+} // namespace cloud_print |
-const char kCloudPrintGaiaServiceId[] = "cloudprint"; |
-const char kProxyAuthUserAgent[] = "ChromiumBrowser"; |
-const char kCloudPrintPushNotificationsSource[] = "cloudprint.google.com"; |
- |
-// The string to be appended to the user-agent for cloudprint requests. |
-const char kCloudPrintUserAgent[] = "GoogleCloudPrintProxy"; |
- |
-// Reasons for fetching print jobs. |
-// Job fetch on proxy startup. |
-const char kJobFetchReasonStartup[] = "startup"; |
-// Job fetch because we are polling. |
-const char kJobFetchReasonPoll[] = "poll"; |
-// Job fetch on being notified by the server. |
-const char kJobFetchReasonNotified[] = "notified"; |
-// Job fetch after a successful print to query for more jobs. |
-const char kJobFetchReasonQueryMore[] = "querymore"; |
- |
-// Short message ids for diagnostic messages sent to the server. |
-const char kPrintSystemFailedMessageId[] = "printsystemfail"; |
-const char kGetPrinterCapsFailedMessageId[] = "getprncapsfail"; |
-const char kEnumPrintersFailedMessageId[] = "enumfail"; |
-const char kZombiePrinterMessageId[] = "zombieprinter"; |