summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorglotov@chromium.org <glotov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-28 15:30:20 +0000
committerglotov@chromium.org <glotov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-28 15:30:20 +0000
commit49699e8f03b77e0deb32eaed9b4c600c7ae1491c (patch)
tree860c64e2ad4d91249c541beda32f36a5456339d8 /chrome/common
parent5a4c4bb277e9673fd17f1262c5fcbed747c534f4 (diff)
downloadchromium_src-49699e8f03b77e0deb32eaed9b4c600c7ae1491c.zip
chromium_src-49699e8f03b77e0deb32eaed9b4c600c7ae1491c.tar.gz
chromium_src-49699e8f03b77e0deb32eaed9b4c600c7ae1491c.tar.bz2
Introduces cros:// schema for web-page to chrome communication in ChromeOS.
Add test that verifies web-page to chrome communication. BUG=cros/3177 TEST=out/Debug/browser_tests --gtest_filter=AccountScreenTest.TestSchemeInspector Review URL: http://codereview.chromium.org/2291002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48487 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/url_constants.cc7
-rw-r--r--chrome/common/url_constants.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 04901a3..9a9cb66 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -25,6 +25,10 @@ const char kMetadataScheme[] = "metadata";
const char kUserScriptScheme[] = "chrome-user-script";
const char kViewSourceScheme[] = "view-source";
+#if defined(OS_CHROMEOS)
+const char kCrosScheme[] = "cros";
+#endif
+
const char kStandardSchemeSeparator[] = "://";
const char* kSavableSchemes[] = {
@@ -107,6 +111,9 @@ void RegisterChromeSchemes() {
url_util::AddStandardScheme(kGearsScheme);
url_util::AddStandardScheme(kExtensionScheme);
url_util::AddStandardScheme(kMetadataScheme);
+#if defined(OS_CHROMEOS)
+ url_util::AddStandardScheme(kCrosScheme);
+#endif
// Prevent future modification of the standard schemes list. This is to
// prevent accidental creation of data races in the program. AddStandardScheme
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 75d698c..8da164d 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -13,6 +13,7 @@ namespace chrome {
extern const char kAboutScheme[];
extern const char kChromeInternalScheme[];
extern const char kChromeUIScheme[]; // The scheme used for DOMUIs.
+extern const char kCrosScheme[]; // The scheme used for ChromeOS.
extern const char kDataScheme[];
extern const char kExtensionScheme[];
extern const char kFileScheme[];