corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1246869 - remove services.sync.syncedTabsUIRefresh preference so SyncedTabs sidebar can ride the trains. r=adw

Browse Source
This commit is contained in:
Mark Hammond
2016-03-01 11:22:47 +11:00
parent 9b478b9ab5
commit 157bd6a35c
4 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
browser/app/profile/firefox.js
View File

@@ -1328,12 +1328,6 @@ pref("services.sync.prefs.sync.signon.rememberSignons", true);
pref("services.sync.prefs.sync.spellchecker.dictionary", true); pref("services.sync.prefs.sync.spellchecker.dictionary", true);
pref("services.sync.prefs.sync.xpinstall.whitelist.required", true); pref("services.sync.prefs.sync.xpinstall.whitelist.required", true);
#ifdef NIGHTLY_BUILD
pref("services.sync.syncedTabsUIRefresh", true);
#else
pref("services.sync.syncedTabsUIRefresh", false);
#endif
// A preference that controls whether we should show the icon for a remote tab. // A preference that controls whether we should show the icon for a remote tab.
// This pref has no UI but exists because some people may be concerned that // This pref has no UI but exists because some people may be concerned that
// fetching these icons to show remote tabs may leak information about that // fetching these icons to show remote tabs may leak information about that

1
browser/base/content/browser-sets.inc
View File

@@ -190,7 +190,6 @@
<broadcaster id="sync-reauth-state" hidden="true"/> <broadcaster id="sync-reauth-state" hidden="true"/>
<broadcaster id="viewTabsSidebar" autoCheck="false" sidebartitle="&syncedTabs.sidebar.label;" <broadcaster id="viewTabsSidebar" autoCheck="false" sidebartitle="&syncedTabs.sidebar.label;"
type="checkbox" group="sidebar" type="checkbox" group="sidebar"
hidden="true"
sidebarurl="chrome://browser/content/syncedtabs/sidebar.xhtml" sidebarurl="chrome://browser/content/syncedtabs/sidebar.xhtml"
oncommand="SidebarUI.toggle('viewTabsSidebar');"/> oncommand="SidebarUI.toggle('viewTabsSidebar');"/>
<broadcaster id="workOfflineMenuitemState"/> <broadcaster id="workOfflineMenuitemState"/>

6
browser/base/content/browser-syncui.js
View File

@@ -81,12 +81,6 @@ var gSyncUI = {
let broadcaster = document.getElementById("sync-status"); let broadcaster = document.getElementById("sync-status");
broadcaster.setAttribute("label", this._stringBundle.GetStringFromName("syncnow.label")); broadcaster.setAttribute("label", this._stringBundle.GetStringFromName("syncnow.label"));
// Initialize the Synced Tabs Sidebar
if (Services.prefs.getBoolPref("services.sync.syncedTabsUIRefresh")) {
let sidebarBroadcaster = document.getElementById("viewTabsSidebar");
sidebarBroadcaster.removeAttribute("hidden");
}
this.maybeMoveSyncedTabsButton(); this.maybeMoveSyncedTabsButton();
this.updateUI(); this.updateUI();

4
browser/base/content/browser.js
View File

@@ -6452,11 +6452,7 @@ function checkEmptyPageOrigin(browser = gBrowser.selectedBrowser,
} }
function BrowserOpenSyncTabs() { function BrowserOpenSyncTabs() {
if (Services.prefs.getBoolPref("services.sync.syncedTabsUIRefresh")) {
gSyncUI.openSyncedTabsPanel(); gSyncUI.openSyncedTabsPanel();
} else {
switchToTabHavingURI("about:sync-tabs", true);
}
} }
/** /**