From db7615cb453dd0805f1da665afc2de4638a6356b Mon Sep 17 00:00:00 2001
From: ckehoe <ckehoe@chromium.org>
Date: Thu, 8 Jan 2015 13:22:19 -0800
Subject: Passing the project ID to the server

BUG=408853

Review URL: https://codereview.chromium.org/834323004

Cr-Commit-Position: refs/heads/master@{#310601}
---
 extensions/common/api/_manifest_features.json | 4 ++++
 extensions/common/manifest_constants.cc       | 5 +++++
 extensions/common/manifest_constants.h        | 4 ++++
 3 files changed, 13 insertions(+)

(limited to 'extensions/common')

diff --git a/extensions/common/api/_manifest_features.json b/extensions/common/api/_manifest_features.json
index 8ba046c..fbe0f5e 100644
--- a/extensions/common/api/_manifest_features.json
+++ b/extensions/common/api/_manifest_features.json
@@ -100,6 +100,10 @@
     // app.content_security_policy whitelist).
     "extension_types": ["extension", "legacy_packaged_app"]
   },
+  "copresence" : {
+    "channel": "stable",
+    "extension_types": "all"
+  },
   "current_locale": {
     "channel": "stable",
     "extension_types": "all"
diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc
index 4565184..6cc5808 100644
--- a/extensions/common/manifest_constants.cc
+++ b/extensions/common/manifest_constants.cc
@@ -30,6 +30,7 @@ const char kContentPackSites[] = "sites";
 const char kContentScripts[] = "content_scripts";
 const char kContentSecurityPolicy[] = "content_security_policy";
 const char kConvertedFromUserScript[] = "converted_from_user_script";
+const char kCopresence[] = "copresence";
 const char kCss[] = "css";
 const char kCtrlKey[] = "ctrlKey";
 const char kCurrentLocale[] = "current_locale";
@@ -224,6 +225,7 @@ const char kRunAtDocumentIdle[] = "document_idle";
 const char kPageActionCommandEvent[] = "_execute_page_action";
 const char kPageActionTypeTab[] = "tab";
 const char kPageActionTypePermanent[] = "permanent";
+const char kProjectId[] = "project_id";
 const char kLaunchContainerPanel[] = "panel";
 const char kLaunchContainerTab[] = "tab";
 const char kLaunchContainerWindow[] = "window";
@@ -318,6 +320,9 @@ const char kInvalidContentScriptsList[] =
     "Invalid value for 'content_scripts'.";
 const char kInvalidContentSecurityPolicy[] =
     "Invalid value for 'content_security_policy'.";
+const char kInvalidCopresenceConfig[] = "Invalid value for 'copresence'.";
+const char kInvalidCopresenceProjectId[] =
+    "copresence.project_id must not be empty.";
 const char kInvalidCSPInsecureValue[] =
     "Ignored insecure CSP value \"*\" in directive '*'.";
 const char kInvalidCSPMissingSecureSrc[] =
diff --git a/extensions/common/manifest_constants.h b/extensions/common/manifest_constants.h
index 7ab779c..402f33d 100644
--- a/extensions/common/manifest_constants.h
+++ b/extensions/common/manifest_constants.h
@@ -33,6 +33,7 @@ extern const char kContentPackSites[];
 extern const char kContentScripts[];
 extern const char kContentSecurityPolicy[];
 extern const char kConvertedFromUserScript[];
+extern const char kCopresence[];
 extern const char kCss[];
 extern const char kCtrlKey[];
 extern const char kCurrentLocale[];
@@ -226,6 +227,7 @@ extern const char kLaunchContainerWindow[];
 extern const char kPageActionCommandEvent[];
 extern const char kPageActionTypePermanent[];
 extern const char kPageActionTypeTab[];
+extern const char kProjectId[];
 extern const char kRunAtDocumentEnd[];
 extern const char kRunAtDocumentIdle[];
 extern const char kRunAtDocumentStart[];
@@ -279,6 +281,8 @@ extern const char kInvalidContentPackSites[];
 extern const char kInvalidContentScript[];
 extern const char kInvalidContentScriptsList[];
 extern const char kInvalidContentSecurityPolicy[];
+extern const char kInvalidCopresenceConfig[];
+extern const char kInvalidCopresenceProjectId[];
 extern const char kInvalidCSPInsecureValue[];
 extern const char kInvalidCSPMissingSecureSrc[];
 extern const char kInvalidCss[];
-- 
cgit v1.1