From 21d40144f51720e9f0c1a1f8285e7276924ab428 Mon Sep 17 00:00:00 2001 From: Philipp von Weitershausen Date: Wed, 26 Oct 2011 16:21:20 -0700 Subject: [PATCH] Bug 624028 - Part 1: Implement "Pair a Device" dialog. r=rnewman --- mobile/chrome/content/browser-scripts.js | 1 + mobile/chrome/content/browser.xul | 26 +++++++ mobile/chrome/content/sync.js | 92 ++++++++++++++++++++++++ mobile/locales/en-US/chrome/sync.dtd | 3 + 4 files changed, 122 insertions(+) diff --git a/mobile/chrome/content/browser-scripts.js b/mobile/chrome/content/browser-scripts.js index 1209fddc9d4..aa4ed082d36 100644 --- a/mobile/chrome/content/browser-scripts.js +++ b/mobile/chrome/content/browser-scripts.js @@ -113,6 +113,7 @@ XPCOMUtils.defineLazyGetter(this, "CommonUI", function() { ["MasterPasswordUI", "chrome://browser/content/MasterPasswordUI.js"], #ifdef MOZ_SERVICES_SYNC ["WeaveGlue", "chrome://browser/content/sync.js"], + ["SyncPairDevice", "chrome://browser/content/sync.js"], #endif ["WebappsUI", "chrome://browser/content/WebappsUI.js"], ["SSLExceptions", "chrome://browser/content/exceptions.js"], diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul index b3a9c3bf234..a10a14f532d 100644 --- a/mobile/chrome/content/browser.xul +++ b/mobile/chrome/content/browser.xul @@ -627,6 +627,32 @@ + + #endif