Bug 1000676 - Part 2: Add MOZ_DEVICES and register about:devices. r=m…

…finkle
Brli · May 5, 2014 · d456fc8 · d456fc8
1 parent 797582e
commit d456fc8
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 0 deletions.
diff --git a/configure.in b/configure.in
@@ -8390,6 +8390,12 @@ if test -n "$MOZ_CAPTIVEDETECT"; then
   AC_DEFINE(MOZ_CAPTIVEDETECT)
 fi
 
+dnl Build second screen and casting features for external devices if required
+AC_SUBST(MOZ_DEVICES)
+if test -n "$MOZ_DEVICES"; then
+  AC_DEFINE(MOZ_DEVICES)
+fi
+
 dnl ========================================================
 if test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC" -o "$MOZ_DMD"; then
     MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=

diff --git a/mobile/android/chrome/jar.mn b/mobile/android/chrome/jar.mn
@@ -56,6 +56,10 @@ chrome.jar:
   content/aboutHealthReport.xhtml      (content/aboutHealthReport.xhtml)
 * content/aboutHealthReport.js         (content/aboutHealthReport.js)
 #endif
+#ifdef MOZ_DEVICES
+  content/aboutDevices.xhtml           (content/aboutDevices.xhtml)
+  content/aboutDevices.js              (content/aboutDevices.js)
+#endif
 
 % content branding %content/branding/
 

diff --git a/mobile/android/components/AboutRedirector.js b/mobile/android/components/AboutRedirector.js
@@ -78,6 +78,12 @@ let modules = {
     privileged: true
   },
 #endif
+#ifdef MOZ_DEVICES
+  devices: {
+    uri: "chrome://browser/content/aboutDevices.xhtml",
+    privileged: true
+  },
+#endif
 }
 
 function AboutRedirector() {}

diff --git a/mobile/android/components/MobileComponents.manifest b/mobile/android/components/MobileComponents.manifest
@@ -18,6 +18,9 @@ contract @mozilla.org/network/protocol/about;1?what=healthreport {322ba47e-7047-
 #ifdef MOZ_SAFE_BROWSING
 contract @mozilla.org/network/protocol/about;1?what=blocked {322ba47e-7047-4f71-aebf-cb7d69325cd9}
 #endif
+#ifdef MOZ_DEVICES
+contract @mozilla.org/network/protocol/about;1?what=devices {322ba47e-7047-4f71-aebf-cb7d69325cd9}
+#endif
 
 # DirectoryProvider.js
 component {ef0f7a87-c1ee-45a8-8d67-26f586e46a4b} DirectoryProvider.js

diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
@@ -69,3 +69,6 @@ MOZ_B2G_CERTDATA=1
 
 # Enable the "synthetic APKs" implementation of Open Web Apps.
 MOZ_ANDROID_SYNTHAPKS=1
+
+# Enable second screen and casting support for external devices.
+MOZ_DEVICES=1
diff --git a/mobile/android/locales/jar.mn b/mobile/android/locales/jar.mn
@@ -10,6 +10,9 @@
   locale/@AB_CD@/browser/aboutAddons.dtd          (%chrome/aboutAddons.dtd)
   locale/@AB_CD@/browser/aboutAddons.properties   (%chrome/aboutAddons.properties)
   locale/@AB_CD@/browser/aboutApps.dtd            (%chrome/aboutApps.dtd)
+#ifdef MOZ_DEVICES
+  locale/@AB_CD@/browser/aboutDevices.dtd         (%chrome/aboutDevices.dtd)
+#endif
   locale/@AB_CD@/browser/aboutCertError.dtd       (%chrome/aboutCertError.dtd)
   locale/@AB_CD@/browser/aboutDownloads.dtd       (%chrome/aboutDownloads.dtd)
   locale/@AB_CD@/browser/aboutDownloads.properties (%chrome/aboutDownloads.properties)

diff --git a/mobile/android/themes/core/jar.mn b/mobile/android/themes/core/jar.mn
@@ -11,6 +11,9 @@ chrome.jar:
 * skin/aboutAddons.css                      (aboutAddons.css)
   skin/aboutApps.css                        (aboutApps.css)
 * skin/aboutBase.css                        (aboutBase.css)
+#ifdef MOZ_DEVICES
+  skin/aboutDevices.css                     (aboutDevices.css)
+#endif
 * skin/aboutDownloads.css                   (aboutDownloads.css)
   skin/aboutFeedback.css                    (aboutFeedback.css)
 #ifdef MOZ_SERVICES_HEALTHREPORT