wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge mozilla-central to fx-team

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2015-04-24 15:01:23 +02:00
commit 8f45f38815
790 changed files with 2978 additions and 72363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CLOBBER
View File

@ -22,8 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.
Bug 1155718: Merge Bluetooth v1/v2 files for all simple cases
This patch set renames source files. This requires updating the
build system's dependency information from scratch. The issue has
been reported in bug 1154232.
Bug 1039866: Removing the metro browser

7
accessible/windows/msaa/AccessibleWrap.cpp
View File

@ -1180,13 +1180,6 @@ AccessibleWrap::HandleAccEvent(AccEvent* aEvent)
nsresult rv = Accessible::HandleAccEvent(aEvent);
NS_ENSURE_SUCCESS(rv, rv);
// Don't fire native MSAA events or mess with the system caret
// when running in metro mode. This confuses input focus tracking
// in metro's UIA implementation.
if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
return NS_OK;
}
uint32_t eventType = aEvent->GetEventType();
static_assert(sizeof(gWinEventMap)/sizeof(gWinEventMap[0]) == nsIAccessibleEvent::EVENT_LAST_ENTRY,

2
b2g/config/dolphin/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0c5e2ee1173f3c53379ef3cd10de714836258fe8"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

2
b2g/config/emulator-ics/sources.xml
View File

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="0c5e2ee1173f3c53379ef3cd10de714836258fe8"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>

2
b2g/config/emulator-jb/sources.xml
View File

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0c5e2ee1173f3c53379ef3cd10de714836258fe8"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="90f848a40efad820ab00fa52bec52dff37255b12"/>

2
b2g/config/emulator-kk/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0c5e2ee1173f3c53379ef3cd10de714836258fe8"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

2
b2g/config/emulator-l/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0c5e2ee1173f3c53379ef3cd10de714836258fe8"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

2
b2g/config/emulator/sources.xml
View File

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="0c5e2ee1173f3c53379ef3cd10de714836258fe8"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>

2
b2g/config/flame-kk/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0c5e2ee1173f3c53379ef3cd10de714836258fe8"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

2
b2g/config/flame/sources.xml
View File

@ -17,7 +17,7 @@
</project>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0c5e2ee1173f3c53379ef3cd10de714836258fe8"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="90f848a40efad820ab00fa52bec52dff37255b12"/>

4
b2g/config/gaia.json
View File

@ -1,9 +1,9 @@
{
"git": {
"git_revision": "0c5e2ee1173f3c53379ef3cd10de714836258fe8",
"git_revision": "5d416244c0d9cbbb5823e872ac4b03addeb59bad",
"remote": "https://git.mozilla.org/releases/gaia.git",
"branch": ""
},
"revision": "910522407a1dd40c9302f2e342f8cf1d4828fc3b",
"revision": "83f70a66bb6c579c56f55592e1dc1fc9957d81e2",
"repo_path": "integration/gaia-central"
}

2
b2g/config/nexus-4/sources.xml
View File

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0c5e2ee1173f3c53379ef3cd10de714836258fe8"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="90f848a40efad820ab00fa52bec52dff37255b12"/>

2
b2g/config/nexus-5-l/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0c5e2ee1173f3c53379ef3cd10de714836258fe8"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

3
browser/app-rules.mk
View File

@ -1,4 +1 @@
PURGECACHES_DIRS = $(DIST)/bin/browser
ifdef MOZ_METRO
PURGECACHES_DIRS += $(DIST)/bin/metro
endif

9
browser/app/moz.build
View File

@ -6,7 +6,7 @@
DIRS += ['profile/extensions']
if CONFIG['OS_ARCH'] == 'WINNT' and (CONFIG['MOZ_METRO'] or CONFIG['MOZ_ASAN']):
if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['MOZ_ASAN']:
GeckoProgram(CONFIG['MOZ_APP_NAME'])
else:
GeckoProgram(CONFIG['MOZ_APP_NAME'], msvcrt='static')
@ -43,10 +43,9 @@ LOCAL_INCLUDES += [
'/xpcom/build',
]
if not CONFIG['MOZ_METRO']:
DELAYLOAD_DLLS += [
'mozglue.dll',
]
DELAYLOAD_DLLS += [
'mozglue.dll',
]
USE_LIBS += [
'mozglue',

221
browser/app/nsBrowserApp.cpp
View File

@ -31,10 +31,6 @@
#include "nsIFile.h"
#include "nsStringGlue.h"
// Easy access to a five second startup delay used to get
// a debugger attached in the metro environment.
// #define DEBUG_delay_start_metro
#ifdef XP_WIN
// we want a wmain entry point
#ifdef MOZ_ASAN
@ -61,12 +57,6 @@ using namespace mozilla;
#define kOSXResourcesFolder "Resources"
#endif
#define kDesktopFolder "browser"
#define kMetroFolder "metro"
#define kMetroAppIniFilename "metroapp.ini"
#ifdef XP_WIN
#define kMetroTestFile "tests.ini"
const char* kMetroConsoleIdParam = "testconsoleid=";
#endif
static void Output(const char *fmt, ... )
{
@ -128,40 +118,6 @@ static bool IsArg(const char* arg, const char* s)
return false;
}
#if defined(XP_WIN) && defined(MOZ_METRO)
/*
* AttachToTestHarness - Windows helper for when we are running
* in the immersive environment. Firefox is launched by Windows in
* response to a request by metrotestharness, which is launched by
* runtests.py. As such stdout in fx doesn't point to the right
* stream. This helper touches up stdout such that test output gets
* routed to a named pipe metrotestharness creates and dumps to its
* stdout.
*/
static void AttachToTestHarness()
{
// attach to the metrotestharness named logging pipe
HANDLE winOut = CreateFileA("\\\\.\\pipe\\metrotestharness",
GENERIC_WRITE,
FILE_SHARE_WRITE, 0,
OPEN_EXISTING, 0, 0);
if (winOut == INVALID_HANDLE_VALUE) {
OutputDebugStringW(L"Could not create named logging pipe.\n");
return;
}
// Set the c runtime handle
int stdOut = _open_osfhandle((intptr_t)winOut, _O_APPEND);
if (stdOut == -1) {
OutputDebugStringW(L"Could not open c-runtime handle.\n");
return;
}
FILE *fp = _fdopen(stdOut, "a");
*stdout = *fp;
}
#endif
XRE_GetFileFromPathType XRE_GetFileFromPath;
XRE_CreateAppDataType XRE_CreateAppData;
XRE_FreeAppDataType XRE_FreeAppData;
@ -234,167 +190,28 @@ static int do_main(int argc, char* argv[], nsIFile *xreDirectory)
return result;
}
bool metroOnDesktop = false;
#ifdef MOZ_METRO
if (argc > 1) {
// This command-line flag is passed to our executable when it is to be
// launched in metro mode (i.e. our EXE is registered as the default
// browser and the user has tapped our EXE's tile)
if (IsArg(argv[1], "ServerName:DefaultBrowserServer")) {
mainFlags = XRE_MAIN_FLAG_USE_METRO;
argv[1] = argv[0];
argv++;
argc--;
} else if (IsArg(argv[1], "BackgroundSessionClosed")) {
// This command line flag is used for indirect shutdowns, the OS
// relaunches Metro Firefox with this command line arg.
mainFlags = XRE_MAIN_FLAG_USE_METRO;
} else {
#ifndef RELEASE_BUILD
// This command-line flag is used to test the metro browser in a desktop
// environment.
for (int idx = 1; idx < argc; idx++) {
if (IsArg(argv[idx], "metrodesktop")) {
metroOnDesktop = true;
// Disable crash reporting when running in metrodesktop mode.
char crashSwitch[] = "MOZ_CRASHREPORTER_DISABLE=1";
putenv(crashSwitch);
break;
}
}
#endif
}
ScopedAppData appData(&sAppData);
nsCOMPtr<nsIFile> exeFile;
rv = mozilla::BinaryPath::GetFile(argv[0], getter_AddRefs(exeFile));
if (NS_FAILED(rv)) {
Output("Couldn't find the application directory.\n");
return 255;
}
#endif
// Desktop browser launch
if (mainFlags != XRE_MAIN_FLAG_USE_METRO && !metroOnDesktop) {
ScopedAppData appData(&sAppData);
nsCOMPtr<nsIFile> exeFile;
rv = mozilla::BinaryPath::GetFile(argv[0], getter_AddRefs(exeFile));
if (NS_FAILED(rv)) {
Output("Couldn't find the application directory.\n");
return 255;
}
nsCOMPtr<nsIFile> greDir;
exeFile->GetParent(getter_AddRefs(greDir));
nsCOMPtr<nsIFile> greDir;
exeFile->GetParent(getter_AddRefs(greDir));
#ifdef XP_MACOSX
greDir->SetNativeLeafName(NS_LITERAL_CSTRING(kOSXResourcesFolder));
greDir->SetNativeLeafName(NS_LITERAL_CSTRING(kOSXResourcesFolder));
#endif
nsCOMPtr<nsIFile> appSubdir;
greDir->Clone(getter_AddRefs(appSubdir));
appSubdir->Append(NS_LITERAL_STRING(kDesktopFolder));
nsCOMPtr<nsIFile> appSubdir;
greDir->Clone(getter_AddRefs(appSubdir));
appSubdir->Append(NS_LITERAL_STRING(kDesktopFolder));
SetStrongPtr(appData.directory, static_cast<nsIFile*>(appSubdir.get()));
// xreDirectory already has a refcount from NS_NewLocalFile
appData.xreDirectory = xreDirectory;
return XRE_main(argc, argv, &appData, mainFlags);
}
// Metro browser launch
#ifdef MOZ_METRO
nsCOMPtr<nsIFile> iniFile, appSubdir;
xreDirectory->Clone(getter_AddRefs(iniFile));
xreDirectory->Clone(getter_AddRefs(appSubdir));
iniFile->Append(NS_LITERAL_STRING(kMetroFolder));
iniFile->Append(NS_LITERAL_STRING(kMetroAppIniFilename));
appSubdir->Append(NS_LITERAL_STRING(kMetroFolder));
nsAutoCString path;
if (NS_FAILED(iniFile->GetNativePath(path))) {
Output("Couldn't get ini file path.\n");
return 255;
}
nsXREAppData *appData;
rv = XRE_CreateAppData(iniFile, &appData);
if (NS_FAILED(rv) || !appData) {
Output("Couldn't read application.ini");
return 255;
}
SetStrongPtr(appData->directory, static_cast<nsIFile*>(appSubdir.get()));
SetStrongPtr(appData.directory, static_cast<nsIFile*>(appSubdir.get()));
// xreDirectory already has a refcount from NS_NewLocalFile
appData->xreDirectory = xreDirectory;
appData.xreDirectory = xreDirectory;
#ifdef XP_WIN
if (!metroOnDesktop) {
nsCOMPtr<nsIFile> testFile;
xreDirectory->Clone(getter_AddRefs(testFile));
testFile->Append(NS_LITERAL_STRING(kMetroTestFile));
nsAutoCString path;
if (NS_FAILED(testFile->GetNativePath(path))) {
Output("Couldn't get test file path.\n");
return 255;
}
// Check for a metro test harness command line args file
HANDLE hTestFile = CreateFileA(path.get(),
GENERIC_READ,
0, nullptr, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL,
nullptr);
if (hTestFile != INVALID_HANDLE_VALUE) {
// Typical test harness command line args string is around 100 bytes.
char buffer[1024];
memset(buffer, 0, sizeof(buffer));
DWORD bytesRead = 0;
if (!ReadFile(hTestFile, (VOID*)buffer, sizeof(buffer)-1,
&bytesRead, nullptr) || !bytesRead) {
CloseHandle(hTestFile);
printf("failed to read test file '%s'", testFile);
return -1;
}
CloseHandle(hTestFile);
// Build new args array
char* newArgv[20];
int newArgc = 1;
memset(newArgv, 0, sizeof(newArgv));
char* ptr = buffer;
newArgv[0] = ptr;
while (*ptr != '\0' &&
(ptr - buffer) < sizeof(buffer) &&
newArgc < ARRAYSIZE(newArgv)) {
if (isspace(*ptr)) {
*ptr = '\0';
ptr++;
newArgv[newArgc] = ptr;
newArgc++;
continue;
}
ptr++;
}
if (ptr == newArgv[newArgc-1])
newArgc--;
// attach browser stdout to metrotestharness stdout
AttachToTestHarness();
int result = XRE_main(newArgc, newArgv, appData, mainFlags);
XRE_FreeAppData(appData);
return result;
}
}
#endif
int result = XRE_main(argc, argv, appData, mainFlags);
XRE_FreeAppData(appData);
return result;
#endif
NS_NOTREACHED("browser do_main failed to pickup proper initialization");
return 255;
return XRE_main(argc, argv, &appData, mainFlags);
}
#ifdef XP_WIN
@ -572,11 +389,8 @@ InitXPCOMGlue(const char *argv0, nsIFile **xreDirectory)
return rv;
}
#ifndef MOZ_METRO
// This will set this thread as the main thread, which in metro land is
// wrong. We initialize this later from the right thread in nsAppRunner.
// This will set this thread as the main thread.
NS_LogInit();
#endif
// chop XPCOM_DLL off exePath
*lastSlash = '\0';
@ -597,9 +411,6 @@ InitXPCOMGlue(const char *argv0, nsIFile **xreDirectory)
int main(int argc, char* argv[])
{
#ifdef DEBUG_delay_start_metro
Sleep(5000);
#endif
uint64_t start = TimeStamp_Now();
#ifdef XP_MACOSX

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

@ -140,7 +140,6 @@ pref("app.update.cert.maxErrors", 5);
// |app.update.url.override| user preference has been set for testing updates or
// when the |app.update.cert.checkAttributes| preference is set to false. Also,
// the |app.update.url.override| preference should ONLY be used for testing.
// IMPORTANT! metro.js should also be updated for updates to certs.X.issuerName
// IMPORTANT! media.gmp-manager.certs.* prefs should also be updated if these
// are updated.
@ -162,17 +161,8 @@ pref("app.update.enabled", true);
pref("app.update.auto", true);
// See chart in nsUpdateService.js source for more details
// incompatibilities are ignored by updates in Metro
pref("app.update.mode", 1);
#ifdef XP_WIN
#ifdef MOZ_METRO
// Enables update checking in the Metro environment.
// add-on incompatibilities are ignored by updates in Metro.
pref("app.update.metro.enabled", true);
#endif
#endif
// If set to true, the Update Service will present no UI for any event.
pref("app.update.silent", false);

9
browser/base/content/browser-menubar.inc
View File

@ -48,15 +48,6 @@
command="Browser:OpenFile"
key="openFileKb"
accesskey="&openFileCmd.accesskey;"/>
#ifdef HAVE_SHELL_SERVICE
#ifdef XP_WIN
#ifdef MOZ_METRO
<menuitem id="menu_switchToMetro"
label="&switchToMetroCmd2.label;"
oncommand="SwitchToMetro()"/>
#endif
#endif
#endif
<menuitem id="menu_close"
class="show-only-for-keyboard"
label="&closeCmd.label;"

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

@ -1393,11 +1393,6 @@ var gBrowserInit = {
Cu.reportError("Could not end startup crash tracking: " + ex);
}
if (typeof WindowsPrefSync !== 'undefined') {
// Pulls in Metro controlled prefs and pushes out Desktop controlled prefs
WindowsPrefSync.init();
}
// Delay this a minute because there's no rush
setTimeout(() => {
this.gmpInstallManager = new GMPInstallManager();
@ -1561,9 +1556,6 @@ var gBrowserInit = {
Cu.reportError(ex);
}
if (typeof WindowsPrefSync !== 'undefined') {
WindowsPrefSync.uninit();
}
if (this.gmpInstallManager) {
this.gmpInstallManager.uninit();
}
@ -3037,56 +3029,6 @@ function populateMirrorTabMenu(popup) {
});
};
function _checkDefaultAndSwitchToMetro() {
#ifdef HAVE_SHELL_SERVICE
#ifdef XP_WIN
#ifdef MOZ_METRO
let shell = Components.classes["@mozilla.org/browser/shell-service;1"].
getService(Components.interfaces.nsIShellService);
let isDefault = shell.isDefaultBrowser(false, false);
if (isDefault) {
let appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"].
getService(Components.interfaces.nsIAppStartup);
Services.prefs.setBoolPref('browser.sessionstore.resume_session_once', true);
let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"]
.createInstance(Ci.nsISupportsPRBool);
Services.obs.notifyObservers(cancelQuit, "quit-application-requested", "restart");
if (!cancelQuit.data) {
appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit |
Components.interfaces.nsIAppStartup.eRestartTouchEnvironment);
}
return true;
}
return false;
#endif
#endif
#endif
}
function SwitchToMetro() {
#ifdef HAVE_SHELL_SERVICE
#ifdef XP_WIN
#ifdef MOZ_METRO
if (this._checkDefaultAndSwitchToMetro()) {
return;
}
let shell = Components.classes["@mozilla.org/browser/shell-service;1"].
getService(Components.interfaces.nsIShellService);
shell.setDefaultBrowser(false, false);
let intervalID = window.setInterval(this._checkDefaultAndSwitchToMetro, 1000);
window.setTimeout(function() { window.clearInterval(intervalID); }, 10000);
#endif
#endif
#endif
}
function getWebNavigation()
{
return gBrowser.webNavigation;

7
browser/base/content/sync/setup.js
View File

@ -472,13 +472,6 @@ var gSyncSetup = {
Weave.Service.identity.syncKey = Weave.Utils.generatePassphrase();
this._handleNoScript(false);
Weave.Svc.Prefs.set("firstSync", "newAccount");
#ifdef XP_WIN
#ifdef MOZ_METRO
if (document.getElementById("metroSetupCheckbox").checked) {
Services.metro.storeSyncInfo(email, password, Weave.Service.identity.syncKey);
}
#endif
#endif
this.wizardFinish();
return false;
}

14
browser/base/content/sync/setup.xul
View File

@ -172,20 +172,6 @@
<label class="status" value=" "/>
</hbox>
</row>
#ifdef XP_WIN
#ifdef MOZ_METRO
<row id="metroRow" align="center">
<spacer/>
<hbox align="center">
<checkbox label="&setup.setupMetro.label;"
accesskey="&setup.setupMetro.accesskey;"
control="weavePasswordConfirm"
id="metroSetupCheckbox"
checked="true"/>
</hbox>
</row>
#endif
#endif
<row id="TOSRow" align="center">
<spacer/>
<hbox align="center">

7
browser/base/content/test/general/browser_bug710878.js
View File

@ -5,23 +5,20 @@ function test()
{
waitForExplicitFinish();
let doc;
gBrowser.selectedTab = gBrowser.addTab();
gBrowser.selectedBrowser.addEventListener("load", function onload() {
gBrowser.selectedBrowser.removeEventListener("load", onload, true);
doc = content.document;
waitForFocus(performTest, content);
}, true);
content.location = "data:text/html,<a href='%23xxx'><span>word1 <span> word2 </span></span><span> word3</span></a>";
content.location = "data:text/html;charset=utf-8,<a href='%23xxx'><span>word1 <span> word2 </span></span><span> word3</span></a>";
function performTest()
{
let doc = content.document;
let link = doc.querySelector("a");;
let text = gatherTextUnder(link);
is(text, "word1 word2 word3", "Text under link is correctly computed.");
doc = null;
gBrowser.removeCurrentTab();
finish();
}

10
browser/branding/aurora/Makefile.in
View File

@ -4,8 +4,7 @@
include $(topsrcdir)/config/config.mk
# On Windows only do this step for browser, skip for metro.
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
BRANDING_FILES := \
firefox.ico \
document.ico \
@ -47,10 +46,3 @@ endif
BRANDING_DEST := $(DIST)/branding
BRANDING_TARGET := export
INSTALL_TARGETS += BRANDING
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
VISUALMANIFEST := VisualElementsManifest.xml
VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
VISUALMANIFEST_PATH := $(DIST)/bin
PP_TARGETS += VISUALMANIFEST
endif

16
browser/branding/aurora/VisualElementsManifest.xml
View File

@ -1,16 +0,0 @@
<Application
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<VisualElements
DisplayName="@MOZ_APP_DISPLAYNAME@"
Logo="tileresources\VisualElements_logo.png"
SmallLogo="tileresources\VisualElements_smalllogo.png"
ForegroundText="light"
BackgroundColor="#1c112e">
<DefaultTile
ShortName="@MOZ_APP_DISPLAYNAME@"
ShowName="allLogos"
/>
<SplashScreen
Image="tileresources\VisualElements_splashscreen.png" />
</VisualElements>
</Application>

7
browser/branding/aurora/content/Makefile.in
View File

@ -4,10 +4,3 @@
# Branding Makefile
# - jars chrome artwork
# resources needed for the metro tile interface
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
TILE_DEST := $(DIST)/bin/tileresources
INSTALL_TARGETS += TILE
endif

BIN
browser/branding/aurora/content/VisualElements_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
browser/branding/aurora/content/VisualElements_smalllogo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
browser/branding/aurora/content/VisualElements_splashscreen.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

8
browser/branding/aurora/content/jar.mn
View File

@ -18,11 +18,3 @@ browser.jar:
content/branding/identity-icons-brand@2x.png (identity-icons-brand@2x.png)
content/branding/silhouette-40.svg (silhouette-40.svg)
content/branding/aboutDialog.css (aboutDialog.css)
#ifdef MOZ_METRO
content/branding/metro-about.css (metro-about.css)
content/branding/metro-about-footer.png (metro-about-footer.png)
content/branding/metro-about-wordmark.png (metro-about-wordmark.png)
content/branding/metro_firstrun_logo.png (metro_firstrun_logo.png)
content/branding/metro_firstrun_logo@1.4x.png (metro_firstrun_logo@1.4x.png)
content/branding/metro_firstrun_logo@1.8x.png (metro_firstrun_logo@1.8x.png)
#endif

BIN
browser/branding/aurora/content/metro-about-footer.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 90 KiB

BIN
browser/branding/aurora/content/metro-about-wordmark.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

14
browser/branding/aurora/content/metro-about.css
View File

@ -1,14 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#about-flyoutpanel {
background-color: #331e54;
color: white;
}
#about-policy-label:hover,
#about-policy-label:active {
background: #181327;
}

BIN
browser/branding/aurora/content/metro_firstrun_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 46 KiB

BIN
browser/branding/aurora/content/metro_firstrun_logo@1.4x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 76 KiB

BIN
browser/branding/aurora/content/metro_firstrun_logo@1.8x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 110 KiB

10
browser/branding/nightly/Makefile.in
View File

@ -4,8 +4,7 @@
include $(topsrcdir)/config/config.mk
# On Windows only do this step for browser, skip for metro.
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
BRANDING_FILES := \
firefox.ico \
document.ico \
@ -47,10 +46,3 @@ endif
BRANDING_DEST := $(DIST)/branding
BRANDING_TARGET := export
INSTALL_TARGETS += BRANDING
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
VISUALMANIFEST := VisualElementsManifest.xml
VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
VISUALMANIFEST_PATH := $(DIST)/bin
PP_TARGETS += VISUALMANIFEST
endif

16
browser/branding/nightly/VisualElementsManifest.xml
View File

@ -1,16 +0,0 @@
<Application
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<VisualElements
DisplayName="@MOZ_APP_DISPLAYNAME@"
Logo="tileresources\VisualElements_logo.png"
SmallLogo="tileresources\VisualElements_smalllogo.png"
ForegroundText="light"
BackgroundColor="#001226">
<DefaultTile
ShortName="@MOZ_APP_DISPLAYNAME@"
ShowName="allLogos"
/>
<SplashScreen
Image="tileresources\VisualElements_splashscreen.png" />
</VisualElements>
</Application>

7
browser/branding/nightly/content/Makefile.in
View File

@ -4,10 +4,3 @@
# Branding Makefile
# - jars chrome artwork
# resources needed for the metro tile interface
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
TILE_DEST := $(DIST)/bin/tileresources
INSTALL_TARGETS += TILE
endif

BIN
browser/branding/nightly/content/VisualElements_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

BIN
browser/branding/nightly/content/VisualElements_smalllogo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
browser/branding/nightly/content/VisualElements_splashscreen.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 170 KiB

8
browser/branding/nightly/content/jar.mn
View File

@ -18,11 +18,3 @@ browser.jar:
content/branding/identity-icons-brand@2x.png (identity-icons-brand@2x.png)
content/branding/silhouette-40.svg (silhouette-40.svg)
content/branding/aboutDialog.css (aboutDialog.css)
#ifdef MOZ_METRO
content/branding/metro-about.css (metro-about.css)
content/branding/metro-about-footer.png (metro-about-footer.png)
content/branding/metro-about-wordmark.png (metro-about-wordmark.png)
content/branding/metro_firstrun_logo.png (metro_firstrun_logo.png)
content/branding/metro_firstrun_logo@1.4x.png (metro_firstrun_logo@1.4x.png)
content/branding/metro_firstrun_logo@1.8x.png (metro_firstrun_logo@1.8x.png)
#endif

BIN
browser/branding/nightly/content/metro-about-footer.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 94 KiB

BIN
browser/branding/nightly/content/metro-about-wordmark.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.6 KiB

14
browser/branding/nightly/content/metro-about.css
View File

@ -1,14 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#about-flyoutpanel {
background-color: #002147;
color: white;
}
#about-policy-label:hover,
#about-policy-label:active {
background: #0a111c;
}

BIN
browser/branding/nightly/content/metro_firstrun_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 51 KiB

BIN
browser/branding/nightly/content/metro_firstrun_logo@1.4x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 88 KiB

BIN
browser/branding/nightly/content/metro_firstrun_logo@1.8x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 132 KiB

10
browser/branding/official/Makefile.in
View File

@ -4,8 +4,7 @@
include $(topsrcdir)/config/config.mk
# On Windows only do this step for browser, skip for metro.
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
BRANDING_FILES := \
firefox.ico \
document.ico \
@ -47,10 +46,3 @@ endif
BRANDING_DEST := $(DIST)/branding
BRANDING_TARGET := export
INSTALL_TARGETS += BRANDING
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
VISUALMANIFEST := VisualElementsManifest.xml
VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
VISUALMANIFEST_PATH := $(DIST)/bin
PP_TARGETS += VISUALMANIFEST
endif

16
browser/branding/official/VisualElementsManifest.xml
View File

@ -1,16 +0,0 @@
<Application
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<VisualElements
DisplayName="@MOZ_APP_DISPLAYNAME@"
Logo="tileresources\VisualElements_logo.png"
SmallLogo="tileresources\VisualElements_smalllogo.png"
ForegroundText="light"
BackgroundColor="#1895f5">
<DefaultTile
ShortName="@MOZ_APP_DISPLAYNAME@"
ShowName="allLogos"
/>
<SplashScreen
Image="tileresources\VisualElements_splashscreen.png" />
</VisualElements>
</Application>

7
browser/branding/official/content/Makefile.in
View File

@ -4,10 +4,3 @@
# Branding Makefile
# - jars chrome artwork
# resources needed for the metro tile interface
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
TILE_DEST := $(DIST)/bin/tileresources
INSTALL_TARGETS += TILE
endif

BIN
browser/branding/official/content/VisualElements_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB

BIN
browser/branding/official/content/VisualElements_smalllogo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
browser/branding/official/content/VisualElements_splashscreen.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 43 KiB

8
browser/branding/official/content/jar.mn
View File

@ -17,11 +17,3 @@ browser.jar:
content/branding/identity-icons-brand@2x.png (identity-icons-brand@2x.png)
content/branding/silhouette-40.svg (silhouette-40.svg)
content/branding/aboutDialog.css (aboutDialog.css)
#ifdef MOZ_METRO
content/branding/metro-about.css (metro-about.css)
content/branding/metro-about-footer.png (metro-about-footer.png)
content/branding/metro-about-wordmark.png (metro-about-wordmark.png)
content/branding/metro_firstrun_logo.png (metro_firstrun_logo.png)
content/branding/metro_firstrun_logo@1.4x.png (metro_firstrun_logo@1.4x.png)
content/branding/metro_firstrun_logo@1.8x.png (metro_firstrun_logo@1.8x.png)
#endif

BIN
browser/branding/official/content/metro-about-footer.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 71 KiB

BIN
browser/branding/official/content/metro-about-wordmark.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.7 KiB

14
browser/branding/official/content/metro-about.css
View File

@ -1,14 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#about-flyoutpanel {
background-color: #0095dd;
color: white;
}
#about-policy-label:hover,
#about-policy-label:active {
background: #036fa4;
}

BIN
browser/branding/official/content/metro_firstrun_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 48 KiB

BIN
browser/branding/official/content/metro_firstrun_logo@1.4x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 78 KiB

BIN
browser/branding/official/content/metro_firstrun_logo@1.8x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 113 KiB

10
browser/branding/unofficial/Makefile.in
View File

@ -4,8 +4,7 @@
include $(topsrcdir)/config/config.mk
# On Windows only do this step for browser, skip for metro.
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
BRANDING_FILES := \
firefox.ico \
document.ico \
@ -47,10 +46,3 @@ endif
BRANDING_DEST := $(DIST)/branding
BRANDING_TARGET := export
INSTALL_TARGETS += BRANDING
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
VISUALMANIFEST := VisualElementsManifest.xml
VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
VISUALMANIFEST_PATH := $(DIST)/bin
PP_TARGETS += VISUALMANIFEST
endif

16
browser/branding/unofficial/VisualElementsManifest.xml
View File

@ -1,16 +0,0 @@
<Application
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<VisualElements
DisplayName="@MOZ_APP_DISPLAYNAME@"
Logo="tileresources\VisualElements_logo.png"
SmallLogo="tileresources\VisualElements_smalllogo.png"
ForegroundText="light"
BackgroundColor="#0a1833">
<DefaultTile
ShortName="@MOZ_APP_DISPLAYNAME@"
ShowName="allLogos"
/>
<SplashScreen
Image="tileresources\VisualElements_splashscreen.png" />
</VisualElements>
</Application>

7
browser/branding/unofficial/content/Makefile.in
View File

@ -4,10 +4,3 @@
# Branding Makefile
# - jars chrome artwork
# resources needed for the metro tile interface
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
TILE_DEST := $(DIST)/bin/tileresources
INSTALL_TARGETS += TILE
endif

BIN
browser/branding/unofficial/content/VisualElements_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
browser/branding/unofficial/content/VisualElements_smalllogo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
browser/branding/unofficial/content/VisualElements_splashscreen.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

8
browser/branding/unofficial/content/jar.mn
View File

@ -18,11 +18,3 @@ browser.jar:
content/branding/identity-icons-brand@2x.png (identity-icons-brand@2x.png)
content/branding/silhouette-40.svg (silhouette-40.svg)
content/branding/aboutDialog.css (aboutDialog.css)
#ifdef MOZ_METRO
content/branding/metro-about.css (metro-about.css)
content/branding/metro-about-footer.png (metro-about-footer.png)
content/branding/metro-about-wordmark.png (metro-about-wordmark.png)
content/branding/metro_firstrun_logo.png (metro_firstrun_logo.png)
content/branding/metro_firstrun_logo@1.4x.png (metro_firstrun_logo@1.4x.png)
content/branding/metro_firstrun_logo@1.8x.png (metro_firstrun_logo@1.8x.png)
#endif

BIN
browser/branding/unofficial/content/metro-about-footer.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 94 KiB

BIN
browser/branding/unofficial/content/metro-about-wordmark.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.6 KiB

14
browser/branding/unofficial/content/metro-about.css
View File

@ -1,14 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#about-flyoutpanel {
background-color: #002147;
color: white;
}
#about-policy-label:hover,
#about-policy-label:active {
background: #0a111c;
}

BIN
browser/branding/unofficial/content/metro_firstrun_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 51 KiB

BIN
browser/branding/unofficial/content/metro_firstrun_logo@1.4x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 88 KiB

BIN
browser/branding/unofficial/content/metro_firstrun_logo@1.8x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 132 KiB

5
browser/build.mk
View File

@ -52,9 +52,4 @@ mochitest:: mochitest-browser-chrome
.PHONY: mochitest-browser-chrome
mochitest-metro-chrome:
$(RUN_MOCHITEST) --metro-immersive --browser-chrome
$(CHECK_TEST_ERROR)
endif

4
browser/components/customizableui/CustomizableUI.jsm
View File

@ -172,10 +172,6 @@ let CustomizableUIInternal = {
#endif
];
if (gPalette.has("switch-to-metro-button")) {
panelPlacements.push("switch-to-metro-button");
}
#ifdef E10S_TESTING_ONLY
if (gPalette.has("e10s-button")) {
let newWindowIndex = panelPlacements.indexOf("new-window-button");

24
browser/components/customizableui/CustomizableWidgets.jsm
View File

@ -993,30 +993,6 @@ const CustomizableWidgets = [
}
}];
#ifdef XP_WIN
#ifdef MOZ_METRO
if (Services.metro && Services.metro.supported) {
let widgetArgs = {tooltiptext: "switch-to-metro-button2.tooltiptext"};
let brandShortName = BrandBundle.GetStringFromName("brandShortName");
let metroTooltip = CustomizableUI.getLocalizedProperty(widgetArgs, "tooltiptext",
[brandShortName]);
CustomizableWidgets.push({
id: "switch-to-metro-button",
label: "switch-to-metro-button2.label",
tooltiptext: metroTooltip,
defaultArea: CustomizableUI.AREA_PANEL,
showInPrivateBrowsing: false, /* See bug 928068 */
onCommand: function(aEvent) {
let win = aEvent.view;
if (win && typeof win.SwitchToMetro == "function") {
win.SwitchToMetro();
}
}
});
}
#endif
#endif
if (Services.prefs.getBoolPref("privacy.panicButton.enabled")) {
CustomizableWidgets.push({
id: "panic-button",

4
browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js
View File

@ -27,7 +27,7 @@ add_task(function testWrapUnwrap() {
// Creating and destroying a widget should correctly deal with panel placeholders
add_task(function testPanelPlaceholders() {
let panel = document.getElementById(CustomizableUI.AREA_PANEL);
let expectedPlaceholders = (isInWin8() ? 1 : 2) + (isInDevEdition() ? 1 : 0);
let expectedPlaceholders = 2 + (isInDevEdition() ? 1 : 0);
is(panel.querySelectorAll(".panel-customization-placeholder").length, expectedPlaceholders, "The number of placeholders should be correct.");
CustomizableUI.createWidget({id: kTestWidget2, label: 'Pretty label', tooltiptext: 'Pretty tooltip', defaultArea: CustomizableUI.AREA_PANEL});
let elem = document.getElementById(kTestWidget2);
@ -36,7 +36,7 @@ add_task(function testPanelPlaceholders() {
ok(wrapper, "There should be a wrapper");
is(wrapper.firstChild.id, kTestWidget2, "Wrapper should have test widget");
is(wrapper.parentNode, panel, "Wrapper should be in panel");
expectedPlaceholders = (isInWin8() ? 3 : 1) + (isInDevEdition() ? 1 : 0);
expectedPlaceholders = 1 + (isInDevEdition() ? 1 : 0);
is(panel.querySelectorAll(".panel-customization-placeholder").length, expectedPlaceholders, "The number of placeholders should be correct.");
CustomizableUI.destroyWidget(kTestWidget2);
wrapper = document.getElementById("wrapper-" + kTestWidget2);

23
browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js
View File

@ -24,7 +24,6 @@ add_task(function() {
"add-ons-button",
"developer-button"];
removeDeveloperButtonIfDevEdition(placementsAfterMove);
addSwitchToMetroButtonInWindows8(placementsAfterMove);
simulateItemDrag(zoomControls, printButton);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
@ -51,7 +50,6 @@ add_task(function() {
"add-ons-button",
"developer-button"];
removeDeveloperButtonIfDevEdition(placementsAfterMove);
addSwitchToMetroButtonInWindows8(placementsAfterMove);
simulateItemDrag(zoomControls, savePageButton);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
ok(CustomizableUI.inDefaultState, "Should be in default state.");
@ -76,7 +74,6 @@ add_task(function() {
"add-ons-button",
"developer-button"];
removeDeveloperButtonIfDevEdition(placementsAfterMove);
addSwitchToMetroButtonInWindows8(placementsAfterMove);
simulateItemDrag(zoomControls, newWindowButton);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
ok(CustomizableUI.inDefaultState, "Should still be in default state.");
@ -100,7 +97,6 @@ add_task(function() {
"add-ons-button",
"developer-button"];
removeDeveloperButtonIfDevEdition(placementsAfterMove);
addSwitchToMetroButtonInWindows8(placementsAfterMove);
simulateItemDrag(zoomControls, historyPanelMenu);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
@ -128,7 +124,6 @@ add_task(function() {
"add-ons-button",
"developer-button"];
removeDeveloperButtonIfDevEdition(placementsAfterMove);
addSwitchToMetroButtonInWindows8(placementsAfterMove);
simulateItemDrag(zoomControls, preferencesButton);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
@ -156,7 +151,6 @@ add_task(function() {
"add-ons-button",
"developer-button"];
removeDeveloperButtonIfDevEdition(placementsAfterInsert);
addSwitchToMetroButtonInWindows8(placementsAfterInsert);
simulateItemDrag(openFileButton, zoomControls);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
@ -196,7 +190,6 @@ add_task(function() {
"add-ons-button",
"developer-button"];
removeDeveloperButtonIfDevEdition(placementsAfterInsert);
addSwitchToMetroButtonInWindows8(placementsAfterInsert);
simulateItemDrag(openFileButton, editControls);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
@ -233,7 +226,6 @@ add_task(function() {
"add-ons-button",
"developer-button"];
removeDeveloperButtonIfDevEdition(placementsAfterMove);
addSwitchToMetroButtonInWindows8(placementsAfterMove);
simulateItemDrag(editControls, zoomControls);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
ok(CustomizableUI.inDefaultState, "Should still be in default state.");
@ -258,7 +250,6 @@ add_task(function() {
"add-ons-button",
"developer-button"];
removeDeveloperButtonIfDevEdition(placementsAfterMove);
addSwitchToMetroButtonInWindows8(placementsAfterMove);
simulateItemDrag(editControls, newWindowButton);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
let zoomControls = document.getElementById("zoom-controls");
@ -286,7 +277,6 @@ add_task(function() {
"add-ons-button",
"developer-button"];
removeDeveloperButtonIfDevEdition(placementsAfterMove);
addSwitchToMetroButtonInWindows8(placementsAfterMove);
simulateItemDrag(editControls, privateBrowsingButton);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
let zoomControls = document.getElementById("zoom-controls");
@ -314,7 +304,6 @@ add_task(function() {
"add-ons-button",
"developer-button"];
removeDeveloperButtonIfDevEdition(placementsAfterMove);
addSwitchToMetroButtonInWindows8(placementsAfterMove);
simulateItemDrag(editControls, savePageButton);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
let zoomControls = document.getElementById("zoom-controls");
@ -341,7 +330,6 @@ add_task(function() {
"edit-controls",
"developer-button"];
removeDeveloperButtonIfDevEdition(placementsAfterMove);
addSwitchToMetroButtonInWindows8(placementsAfterMove);
simulateItemDrag(editControls, panel);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
let zoomControls = document.getElementById("zoom-controls");
@ -367,7 +355,6 @@ add_task(function() {
"add-ons-button",
"developer-button"];
removeDeveloperButtonIfDevEdition(placementsAfterMove);
addSwitchToMetroButtonInWindows8(placementsAfterMove);
let paletteChildElementCount = palette.childElementCount;
simulateItemDrag(editControls, palette);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@ -390,7 +377,7 @@ add_task(function() {
yield startCustomizing();
let editControls = document.getElementById("edit-controls");
let panel = document.getElementById(CustomizableUI.AREA_PANEL);
let numPlaceholders = isInWin8() ? 1 : 2;
let numPlaceholders = 2;
for (let i = 0; i < numPlaceholders; i++) {
// NB: We can't just iterate over all of the placeholders
// because each drag-drop action recreates them.
@ -408,7 +395,6 @@ add_task(function() {
"edit-controls",
"developer-button"];
removeDeveloperButtonIfDevEdition(placementsAfterMove);
addSwitchToMetroButtonInWindows8(placementsAfterMove);
simulateItemDrag(editControls, placeholder);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
let zoomControls = document.getElementById("zoom-controls");
@ -451,18 +437,11 @@ add_task(function() {
"edit-controls",
"developer-button"];
removeDeveloperButtonIfDevEdition(placementsAfterMove);
addSwitchToMetroButtonInWindows8(placementsAfterMove);
simulateItemDrag(editControls, target);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
let itemToDrag = "sync-button";
let button = document.getElementById(itemToDrag);
placementsAfterMove.splice(11, 0, itemToDrag);
if (isInWin8()) {
placementsAfterMove[10] = placementsAfterMove[11];
placementsAfterMove[11] = placementsAfterMove[12];
placementsAfterMove[12] = placementsAfterMove[13];
placementsAfterMove[13] = "edit-controls";
}
simulateItemDrag(button, editControls);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);

65
browser/components/customizableui/test/browser_890140_orphaned_placeholders.js
View File

@ -10,18 +10,14 @@ requestLongerTimeout(2);
add_task(function() {
yield startCustomizing();
if (isInWin8()) {
CustomizableUI.removeWidgetFromArea("switch-to-metro-button");
ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
}
if (isInDevEdition()) {
CustomizableUI.addWidgetToArea("developer-button", CustomizableUI.AREA_PANEL);
ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
}
if (!isInWin8() && !isInDevEdition()) {
if (!isInDevEdition()) {
ok(CustomizableUI.inDefaultState, "Should be in default state.");
} else {
ok(!CustomizableUI.inDefaultState, "Should not be in default state if on Win8 or DevEdition.");
ok(!CustomizableUI.inDefaultState, "Should not be in default state if on DevEdition.");
}
let btn = document.getElementById("open-file-button");
@ -35,9 +31,6 @@ add_task(function() {
yield startCustomizing();
is(getVisiblePlaceholderCount(panel), 2, "Should only have 2 visible placeholders after re-entering");
if (isInWin8()) {
CustomizableUI.addWidgetToArea("switch-to-metro-button", CustomizableUI.AREA_PANEL);
}
if (isInDevEdition()) {
CustomizableUI.addWidgetToArea("developer-button", CustomizableUI.AREA_NAVBAR, 2);
}
@ -58,18 +51,12 @@ add_task(function() {
let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
let placementsAfterAppend = placements;
if (!isInWin8()) {
placementsAfterAppend = placements.concat(["open-file-button"]);
simulateItemDrag(btn, panel);
}
placementsAfterAppend = placements.concat(["open-file-button"]);
simulateItemDrag(btn, panel);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
if (isInWin8() && !isInDevEdition()) {
ok(CustomizableUI.inDefaultState, "Should be in default state if on Win8 and not on DevEdition.");
} else {
ok(!CustomizableUI.inDefaultState, "Should not be in default state if not Win8 or on DevEdition.");
}
ok(!CustomizableUI.inDefaultState, "Should not be in default state.");
is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholder before exiting");
@ -80,10 +67,9 @@ add_task(function() {
let palette = document.getElementById("customization-palette");
simulateItemDrag(btn, palette);
if (!isInWin8()) {
btn = document.getElementById("open-file-button");
simulateItemDrag(btn, palette);
}
btn = document.getElementById("open-file-button");
simulateItemDrag(btn, palette);
if (isInDevEdition()) {
CustomizableUI.addWidgetToArea("developer-button", CustomizableUI.AREA_NAVBAR, 2);
}
@ -101,7 +87,6 @@ add_task(function() {
let btn = document.getElementById("add-ons-button");
let btn2 = document.getElementById("developer-button");
let btn3 = document.getElementById("switch-to-metro-button");
let panel = document.getElementById(CustomizableUI.AREA_PANEL);
let palette = document.getElementById("customization-palette");
let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
@ -110,11 +95,6 @@ add_task(function() {
simulateItemDrag(btn, palette);
simulateItemDrag(btn2, palette);
if (isInWin8()) {
placementsAfterAppend = placementsAfterAppend.filter(p => p != btn3.id);
simulateItemDrag(btn3, palette);
}
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholder before exiting");
@ -126,10 +106,6 @@ add_task(function() {
simulateItemDrag(btn, panel);
simulateItemDrag(btn2, panel);
if (isInWin8()) {
simulateItemDrag(btn3, panel);
}
assertAreaPlacements(CustomizableUI.AREA_PANEL, placements);
if (isInDevEdition()) {
@ -149,7 +125,6 @@ add_task(function() {
let btn = document.getElementById("edit-controls");
let btn2 = document.getElementById("developer-button");
let btn3 = document.getElementById("switch-to-metro-button");
let panel = document.getElementById(CustomizableUI.AREA_PANEL);
let palette = document.getElementById("customization-palette");
let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
@ -157,12 +132,6 @@ add_task(function() {
placements.pop();
simulateItemDrag(btn2, palette);
if (isInWin8()) {
// Remove switch-to-metro-button
placements.pop();
simulateItemDrag(btn3, palette);
}
let placementsAfterAppend = placements.concat([placements.shift()]);
simulateItemDrag(btn, panel);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
@ -175,10 +144,6 @@ add_task(function() {
simulateItemDrag(btn2, panel);
if (isInWin8()) {
simulateItemDrag(btn3, panel);
}
let zoomControls = document.getElementById("zoom-controls");
simulateItemDrag(btn, zoomControls);
@ -194,18 +159,10 @@ add_task(function() {
yield startCustomizing();
let numPlaceholders = -1;
if (isInWin8()) {
if (isInDevEdition()) {
numPlaceholders = 2;
} else {
numPlaceholders = 1;
}
if (isInDevEdition()) {
numPlaceholders = 3;
} else {
if (isInDevEdition()) {
numPlaceholders = 3;
} else {
numPlaceholders = 2;
}
numPlaceholders = 2;
}
let panel = document.getElementById(CustomizableUI.AREA_PANEL);

12
browser/components/customizableui/test/head.js
View File

@ -127,18 +127,6 @@ function removeDeveloperButtonIfDevEdition(areaPanelPlacements) {
}
}
function isInWin8() {
if (!Services.metro)
return false;
return Services.metro.supported;
}
function addSwitchToMetroButtonInWindows8(areaPanelPlacements) {
if (isInWin8()) {
areaPanelPlacements.push("switch-to-metro-button");
}
}
function assertAreaPlacements(areaId, expectedPlacements) {
let actualPlacements = getAreaWidgetIds(areaId);
placementArraysEqual(areaId, actualPlacements, expectedPlacements);

48
browser/components/preferences/advanced.js
View File

@ -625,22 +625,10 @@ var gAdvancedPane = {
{
var enabledPref = document.getElementById("app.update.enabled");
var autoPref = document.getElementById("app.update.auto");
#ifdef XP_WIN
#ifdef MOZ_METRO
var metroEnabledPref = document.getElementById("app.update.metro.enabled");
#endif
#endif
var radiogroup = document.getElementById("updateRadioGroup");
if (!enabledPref.value) // Don't care for autoPref.value in this case.
radiogroup.value="manual"; // 3. Never check for updates.
#ifdef XP_WIN
#ifdef MOZ_METRO
// enabledPref.value && autoPref.value && metroEnabledPref.value
else if (metroEnabledPref.value && this._showingWin8Prefs)
radiogroup.value="autoMetro"; // 0. Automatically install updates for both Metro and Desktop
#endif
#endif
else if (autoPref.value) // enabledPref.value && autoPref.value
radiogroup.value="auto"; // 1. Automatically install updates for Desktop only
else // enabledPref.value && !autoPref.value
@ -659,14 +647,6 @@ var gAdvancedPane = {
// the warnIncompatible checkbox value is set by readAddonWarn
warnIncompatible.disabled = radiogroup.disabled || modePref.locked ||
!enabledPref.value || !autoPref.value;
#ifdef XP_WIN
#ifdef MOZ_METRO
if (this._showingWin8Prefs) {
warnIncompatible.disabled |= metroEnabledPref.value;
warnIncompatible.checked |= metroEnabledPref.value;
}
#endif
#endif
#ifdef MOZ_MAINTENANCE_SERVICE
// Check to see if the maintenance service is installed.
@ -715,31 +695,12 @@ var gAdvancedPane = {
var enabledPref = document.getElementById("app.update.enabled");
var autoPref = document.getElementById("app.update.auto");
var modePref = document.getElementById("app.update.mode");
#ifdef XP_WIN
#ifdef MOZ_METRO
var metroEnabledPref = document.getElementById("app.update.metro.enabled");
// Initialize the pref to false only if we're showing the option
if (this._showingWin8Prefs) {
metroEnabledPref.value = false;
}
#endif
#endif
var radiogroup = document.getElementById("updateRadioGroup");
switch (radiogroup.value) {
case "auto": // 1. Automatically install updates for Desktop only
enabledPref.value = true;
autoPref.value = true;
break;
#ifdef XP_WIN
#ifdef MOZ_METRO
case "autoMetro": // 0. Automatically install updates for both Metro and Desktop
enabledPref.value = true;
autoPref.value = true;
metroEnabledPref.value = true;
modePref.value = 1;
break;
#endif
#endif
case "checkOnly": // 2. Check, but let me choose
enabledPref.value = true;
autoPref.value = false;
@ -753,15 +714,6 @@ var gAdvancedPane = {
warnIncompatible.disabled = enabledPref.locked || !enabledPref.value ||
autoPref.locked || !autoPref.value ||
modePref.locked;
#ifdef XP_WIN
#ifdef MOZ_METRO
if (this._showingWin8Prefs) {
warnIncompatible.disabled |= metroEnabledPref.value;
warnIncompatible.checked |= metroEnabledPref.value;
}
#endif
#endif
},
/**

17
browser/components/preferences/advanced.xul
View File

@ -61,11 +61,6 @@
#ifdef MOZ_UPDATER
<preference id="app.update.enabled" name="app.update.enabled" type="bool"/>
<preference id="app.update.auto" name="app.update.auto" type="bool"/>
#ifdef XP_WIN
#ifdef MOZ_METRO
<preference id="app.update.metro.enabled" name="app.update.metro.enabled" type="bool"/>
#endif
#endif
<preference id="app.update.mode" name="app.update.mode" type="int"/>
<preference id="app.update.disable_button.showUpdateHistory"
@ -310,18 +305,6 @@
<caption label="&updateApp.label;"/>
<radiogroup id="updateRadioGroup"
oncommand="gAdvancedPane.updateWritePrefs();">
#ifdef XP_WIN
#ifdef MOZ_METRO
<radio id="autoMetro"
value="autoMetro"
label="&updateAutoMetro.label;"
accesskey="&updateAutoMetro.accesskey;"/>
<hbox id="autoMetroIndent"
class="indent">
<label value="&updateAutoMetroWarn.label;"/>
</hbox>
#endif
#endif
<radio id="autoDesktop"
value="auto"
label="&updateAuto1.label;"

47
browser/components/preferences/in-content/advanced.js
View File

@ -663,22 +663,10 @@ var gAdvancedPane = {
{
var enabledPref = document.getElementById("app.update.enabled");
var autoPref = document.getElementById("app.update.auto");
#ifdef XP_WIN
#ifdef MOZ_METRO
var metroEnabledPref = document.getElementById("app.update.metro.enabled");
#endif
#endif
var radiogroup = document.getElementById("updateRadioGroup");
if (!enabledPref.value) // Don't care for autoPref.value in this case.
radiogroup.value="manual"; // 3. Never check for updates.
#ifdef XP_WIN
#ifdef MOZ_METRO
// enabledPref.value && autoPref.value && metroEnabledPref.value
else if (metroEnabledPref.value && this._showingWin8Prefs)
radiogroup.value="autoMetro"; // 0. Automatically install updates
#endif
#endif
else if (autoPref.value) // enabledPref.value && autoPref.value
radiogroup.value="auto"; // 1. Automatically install updates
else // enabledPref.value && !autoPref.value
@ -697,14 +685,6 @@ var gAdvancedPane = {
// the warnIncompatible checkbox value is set by readAddonWarn
warnIncompatible.disabled = radiogroup.disabled || modePref.locked ||
!enabledPref.value || !autoPref.value;
#ifdef XP_WIN
#ifdef MOZ_METRO
if (this._showingWin8Prefs) {
warnIncompatible.disabled |= metroEnabledPref.value;
warnIncompatible.checked |= metroEnabledPref.value;
}
#endif
#endif
#ifdef MOZ_MAINTENANCE_SERVICE
// Check to see if the maintenance service is installed.
@ -735,31 +715,12 @@ var gAdvancedPane = {
var enabledPref = document.getElementById("app.update.enabled");
var autoPref = document.getElementById("app.update.auto");
var modePref = document.getElementById("app.update.mode");
#ifdef XP_WIN
#ifdef MOZ_METRO
var metroEnabledPref = document.getElementById("app.update.metro.enabled");
// Initialize the pref to false only if we're showing the option
if (this._showingWin8Prefs) {
metroEnabledPref.value = false;
}
#endif
#endif
var radiogroup = document.getElementById("updateRadioGroup");
switch (radiogroup.value) {
case "auto": // 1. Automatically install updates for Desktop only
enabledPref.value = true;
autoPref.value = true;
break;
#ifdef XP_WIN
#ifdef MOZ_METRO
case "autoMetro": // 0. Automatically install updates for both Metro and Desktop
enabledPref.value = true;
autoPref.value = true;
metroEnabledPref.value = true;
modePref.value = 1;
break;
#endif
#endif
case "checkOnly": // 2. Check, but let me choose
enabledPref.value = true;
autoPref.value = false;
@ -773,14 +734,6 @@ var gAdvancedPane = {
warnIncompatible.disabled = enabledPref.locked || !enabledPref.value ||
autoPref.locked || !autoPref.value ||
modePref.locked;
#ifdef XP_WIN
#ifdef MOZ_METRO
if (this._showingWin8Prefs) {
warnIncompatible.disabled |= metroEnabledPref.value;
warnIncompatible.checked |= metroEnabledPref.value;
}
#endif
#endif
},
/**

19
browser/components/preferences/in-content/advanced.xul
View File

@ -70,13 +70,6 @@
<preference id="app.update.auto"
name="app.update.auto"
type="bool"/>
#ifdef XP_WIN
#ifdef MOZ_METRO
<preference id="app.update.metro.enabled"
name="app.update.metro.enabled"
type="bool"/>
#endif
#endif
<preference id="app.update.mode"
name="app.update.mode"
type="int"/>
@ -329,18 +322,6 @@
<groupbox id="updateApp" align="start">
<caption><label>&updateApp.label;</label></caption>
<radiogroup id="updateRadioGroup" align="start">
#ifdef XP_WIN
#ifdef MOZ_METRO
<radio id="autoMetro"
value="autoMetro"
label="&updateAutoMetro.label;"
accesskey="&updateAutoMetro.accesskey;"/>
<hbox id="autoMetroIndent"
class="indent">
<label>&updateAutoMetroWarn.label;</label>
</hbox>
#endif
#endif
<radio id="autoDesktop"
value="auto"
label="&updateAuto1.label;"

25
browser/components/preferences/in-content/main.js
View File

@ -27,31 +27,6 @@ var gMainPane = {
// in case the default changes. On other Windows OS's defaults can also
// be set while the prefs are open.
window.setInterval(this.updateSetDefaultBrowser, 1000);
#ifdef MOZ_METRO
// Pre Windows 8, we should hide the update related settings
// for the Metro browser
let version = Components.classes["@mozilla.org/system-info;1"].
getService(Components.interfaces.nsIPropertyBag2).
getProperty("version");
let preWin8 = parseFloat(version) < 6.2;
this._showingWin8Prefs = !preWin8;
if (preWin8) {
["autoMetro", "autoMetroIndent"].forEach(
function(id) document.getElementById(id).collapsed = true
);
} else {
let brandShortName =
document.getElementById("bundleBrand").getString("brandShortName");
let bundlePrefs = document.getElementById("bundlePreferences");
let autoDesktop = document.getElementById("autoDesktop");
autoDesktop.label =
bundlePrefs.getFormattedString("updateAutoDesktop.label",
[brandShortName]);
autoDesktop.accessKey =
bundlePrefs.getString("updateAutoDesktop.accessKey");
}
#endif
#endif
#endif

25
browser/components/preferences/main.js
View File

@ -26,31 +26,6 @@ var gMainPane = {
// in case the default changes. On other Windows OS's defaults can also
// be set while the prefs are open.
window.setInterval(this.updateSetDefaultBrowser, 1000);
#ifdef MOZ_METRO
// Pre Windows 8, we should hide the update related settings
// for the Metro browser
let version = Components.classes["@mozilla.org/system-info;1"].
getService(Components.interfaces.nsIPropertyBag2).
getProperty("version");
let preWin8 = parseFloat(version) < 6.2;
this._showingWin8Prefs = !preWin8;
if (preWin8) {
["autoMetro", "autoMetroIndent"].forEach(
function(id) document.getElementById(id).collapsed = true
);
} else {
let brandShortName =
document.getElementById("bundleBrand").getString("brandShortName");
let bundlePrefs = document.getElementById("bundlePreferences");
let autoDesktop = document.getElementById("autoDesktop");
autoDesktop.label =
bundlePrefs.getFormattedString("updateAutoDesktop.label",
[brandShortName]);
autoDesktop.accessKey =
bundlePrefs.getString("updateAutoDesktop.accessKey");
}
#endif
#endif
#endif

28
browser/extensions/Makefile.in
View File

@ -2,10 +2,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.
ifdef MOZ_METRO
GENERATED_DIRS = $(DIST)/bin/metro/chrome
endif
include $(topsrcdir)/config/rules.mk
exclude_files = \
@ -34,27 +30,3 @@ libs:: $(FINAL_TARGET)/chrome/shumway.manifest
$(FINAL_TARGET)/chrome
$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest 'manifest chrome/shumway.manifest')
endif
ifdef MOZ_METRO
ifdef NIGHTLY_BUILD
$(DIST)/bin/metro/chrome/pdfjs.manifest: $(GLOBAL_DEPS)
printf 'manifest pdfjs/chrome.manifest' > $@
libs:: $(DIST)/bin/metro/chrome/pdfjs.manifest
$(PYTHON) $(topsrcdir)/config/nsinstall.py \
$(srcdir)/pdfjs \
$(foreach exclude,$(exclude_files), -X $(srcdir)/pdfjs/$(exclude)) \
$(DIST)/bin/metro/chrome
$(call py_action,buildlist,$(DIST)/bin/metro/chrome.manifest 'manifest chrome/pdfjs.manifest')
$(DIST)/bin/metro/chrome/shumway.manifest: $(GLOBAL_DEPS)
printf 'manifest shumway/chrome.manifest' > $@
libs:: $(DIST)/bin/metro/chrome/shumway.manifest
$(PYTHON) $(topsrcdir)/config/nsinstall.py \
$(srcdir)/shumway \
$(foreach exclude,$(exclude_files), -X $(srcdir)/shumway/$(exclude)) \
$(DIST)/bin/metro/chrome
$(call py_action,buildlist,$(DIST)/bin/metro/chrome.manifest 'manifest chrome/shumway.manifest')
endif
endif

30
browser/installer/package-manifest.in
View File

@ -886,36 +886,6 @@ bin/libfreebl_32int64_3.so
@RESPATH@/webapprt/modules/WebRTCHandler.jsm
#endif
#ifdef MOZ_METRO
@RESPATH@/components/MetroUIUtils.js
@RESPATH@/components/MetroUIUtils.manifest
[metro]
; gre resources
@BINPATH@/CommandExecuteHandler@BIN_SUFFIX@
@RESPATH@/resources.pri
@RESPATH@/VisualElementsManifest.xml
@RESPATH@/tileresources
; app dir resources
@RESPATH@/metro/chrome.manifest
@RESPATH@/metro/searchplugins
@RESPATH@/metro/metroapp.ini
@RESPATH@/metro/chrome/browser@JAREXT@
@RESPATH@/metro/chrome/browser.manifest
@RESPATH@/metro/chrome/chrome@JAREXT@
@RESPATH@/metro/chrome/chrome.manifest
@RESPATH@/metro/chrome/@AB_CD@@JAREXT@
@RESPATH@/metro/chrome/@AB_CD@.manifest
#ifdef NIGHTLY_BUILD
@RESPATH@/metro/chrome/shumway.manifest
@RESPATH@/metro/chrome/shumway/*
@RESPATH@/metro/chrome/pdfjs.manifest
@RESPATH@/metro/chrome/pdfjs/*
#endif
@RESPATH@/metro/components
@RESPATH@/metro/defaults
@RESPATH@/metro/modules
#endif
@RESPATH@/components/DataStore.manifest
@RESPATH@/components/DataStoreImpl.js
@RESPATH@/components/dom_datastore.xpt

4
browser/installer/windows/nsis/defines.nsi.in
View File

@ -74,10 +74,6 @@
!define MOZ_MAINTENANCE_SERVICE
#endif
#ifdef MOZ_METRO
!define MOZ_METRO
#endif
# File details shared by both the installer and uninstaller
VIProductVersion "1.0.0.0"
VIAddVersionKey "ProductName" "${BrandShortName}"

77
browser/installer/windows/nsis/installer.nsi
View File

@ -100,9 +100,6 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
!insertmacro RegCleanAppHandler
!insertmacro RegCleanMain
!insertmacro RegCleanUninstall
!ifdef MOZ_METRO
!insertmacro RemoveDEHRegistrationIfMatching
!endif
!insertmacro RemovePrecompleteEntries
!insertmacro SetAppLSPCategories
!insertmacro SetBrandNameVars
@ -340,9 +337,6 @@ Section "-Application" APP_IDX
SetShellVarContext current ; Set SHCTX to HKCU
${RegCleanMain} "Software\Mozilla"
${RegCleanUninstall}
!ifdef MOZ_METRO
${ResetWin8PromptKeys} "HKCU" ""
!endif
${UpdateProtocolHandlers}
ClearErrors
@ -428,24 +422,12 @@ Section "-Application" APP_IDX
${Else}
WriteRegDWORD HKCU "$0" "IconsVisible" 0
${EndIf}
!ifdef MOZ_METRO
${CleanupMetroBrowserHandlerValues} ${DELEGATE_EXECUTE_HANDLER_ID} \
"FirefoxURL" \
"FirefoxHTML"
${AddMetroBrowserHandlerValues} ${DELEGATE_EXECUTE_HANDLER_ID} \
"$INSTDIR\CommandExecuteHandler.exe" \
$AppUserModelID \
"FirefoxURL" \
"FirefoxHTML"
!else
; The metro browser is not enabled by the mozconfig.
${If} ${AtLeastWin8}
${RemoveDEHRegistration} ${DELEGATE_EXECUTE_HANDLER_ID} \
$AppUserModelID \
"FirefoxURL" \
"FirefoxHTML"
${EndIf}
!endif
${EndIf}
!ifdef MOZ_MAINTENANCE_SERVICE
@ -815,21 +797,7 @@ Function LaunchApp
${If} ${Errors}
StrCpy $1 "0"
StrCpy $2 "0"
!ifdef MOZ_METRO
; Check to see if this install location is currently set as the
; default browser.
AppAssocReg::QueryAppIsDefaultAll "${AppRegName}" "effective"
Pop $1
; Check for a last run type to see if metro was the last browser
; front end in use.
ReadRegDWORD $2 HKCU "Software\Mozilla\Firefox" "MetroLastAHE"
!endif
${If} $1 == "1"
${AndIf} $2 == "1" ; 1 equals AHE_IMMERSIVE
; Launch into metro
Exec "$\"$INSTDIR\CommandExecuteHandler.exe$\" --launchmetro"
${Else}
; Launch into desktop
Exec "$\"$INSTDIR\${FileMainEXE}$\""
${EndIf}
${Else}
@ -850,20 +818,7 @@ Function LaunchAppFromElevatedProcess
SetOutPath "$1"
StrCpy $2 "0"
StrCpy $3 "0"
!ifdef MOZ_METRO
; Check to see if this install location is currently set as the
; default browser.
AppAssocReg::QueryAppIsDefaultAll "${AppRegName}" "effective"
Pop $2
; Check for a last run type to see if metro was the last browser
; front end in use.
ReadRegDWORD $3 HKCU "Software\Mozilla\Firefox" "MetroLastAHE"
!endif
${If} $2 == "1"
${AndIf} $3 == "1" ; 1 equals AHE_IMMERSIVE
; Launch into metro
Exec "$\"$1\CommandExecuteHandler.exe$\" --launchmetro"
${Else}
; Launch into desktop
Exec "$\"$0$\""
${EndIf}
@ -950,15 +905,7 @@ Function leaveShortcuts
Abort
${EndIf}
${MUI_INSTALLOPTIONS_READ} $AddDesktopSC "shortcuts.ini" "Field 2" "State"
; If we have a Metro browser and are Win8, then we don't have a Field 3
!ifdef MOZ_METRO
${Unless} ${AtLeastWin8}
!endif
${MUI_INSTALLOPTIONS_READ} $AddStartMenuSC "shortcuts.ini" "Field 3" "State"
!ifdef MOZ_METRO
${EndIf}
!endif
${MUI_INSTALLOPTIONS_READ} $AddStartMenuSC "shortcuts.ini" "Field 3" "State"
; Don't install the quick launch shortcut on Windows 7
${Unless} ${AtLeastWin7}
@ -1237,21 +1184,13 @@ Function .onInit
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" State "1"
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Flags "GROUP"
; Don't offer to install the start menu shortcut on Windows 8
; for Metro builds.
!ifdef MOZ_METRO
${Unless} ${AtLeastWin8}
!endif
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Type "checkbox"
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Text "$(ICONS_STARTMENU)"
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Left "0"
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Right "-1"
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Top "40"
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Bottom "50"
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" State "1"
!ifdef MOZ_METRO
${EndIf}
!endif
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Type "checkbox"
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Text "$(ICONS_STARTMENU)"
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Left "0"
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Right "-1"
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Top "40"
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Bottom "50"
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" State "1"
; Don't offer to install the quick launch shortcut on Windows 7
${Unless} ${AtLeastWin7}

80
browser/installer/windows/nsis/shared.nsh
View File

@ -23,39 +23,6 @@
!define HKEY_USERS 0x80000003
!endif
; Does metro registration for the command execute handler
Function RegisterCEH
!ifdef MOZ_METRO
${If} ${AtLeastWin8}
${CleanupMetroBrowserHandlerValues} ${DELEGATE_EXECUTE_HANDLER_ID} \
"FirefoxURL" \
"FirefoxHTML"
${AddMetroBrowserHandlerValues} ${DELEGATE_EXECUTE_HANDLER_ID} \
"$INSTDIR\CommandExecuteHandler.exe" \
$AppUserModelID \
"FirefoxURL" \
"FirefoxHTML"
${EndIf}
!endif
FunctionEnd
; If we're in Win8 make sure we have a start menu shortcut and that it has
; the correct AppuserModelID so that the Metro browser has a Metro tile.
Function RegisterStartMenuTile
!ifdef MOZ_METRO
${If} ${AtLeastWin8}
CreateShortCut "$SMPROGRAMS\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}"
${If} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk"
ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\${BrandFullName}.lnk" \
"$INSTDIR"
${If} "$AppUserModelID" != ""
ApplicationID::Set "$SMPROGRAMS\${BrandFullName}.lnk" "$AppUserModelID" "true"
${EndIf}
${EndIf}
${EndIf}
!endif
FunctionEnd
!macro PostUpdate
; PostUpdate is called from both session 0 and from the user session
@ -76,10 +43,6 @@ FunctionEnd
${If} ${FileExists} "$0"
${GetLongPath} "$0" $0
${EndIf}
${If} "$0" == "$INSTDIR"
; Win8 specific registration
Call RegisterStartMenuTile
${EndIf}
${EndIf}
${CreateShortcutsLog}
@ -223,28 +186,12 @@ FunctionEnd
!endif
; Register the DEH
!ifdef MOZ_METRO
${If} ${AtLeastWin8}
${AndIf} $9 != 0 ; We're not running in session 0
; If RegisterCEH is called too close to changing the shortcut AppUserModelID
; and if the tile image is not already in cache. Then Windows won't refresh
; the tile image on the start screen. So wait before calling RegisterCEH.
; We only need to do this when the DEH doesn't already exist.
ReadRegStr $0 HKCU "Software\Classes\FirefoxURL\shell\open\command" "DelegateExecute"
${If} $0 != ${DELEGATE_EXECUTE_HANDLER_ID}
Sleep 3000
${EndIf}
Call RegisterCEH
${EndIf}
!else
; The metro browser is not enabled by the mozconfig.
${If} ${AtLeastWin8}
${RemoveDEHRegistration} ${DELEGATE_EXECUTE_HANDLER_ID} \
$AppUserModelID \
"FirefoxURL" \
"FirefoxHTML"
${EndIf}
!endif
${If} ${AtLeastWin8}
${RemoveDEHRegistration} ${DELEGATE_EXECUTE_HANDLER_ID} \
$AppUserModelID \
"FirefoxURL" \
"FirefoxHTML"
${EndIf}
!macroend
!define PostUpdate "!insertmacro PostUpdate"
@ -456,8 +403,6 @@ FunctionEnd
${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" "${AppRegName} URL" \
"true"
Call RegisterCEH
; An empty string is used for the 4th & 5th params because the following
; protocol handlers already have a display name and the additional keys
; required for a protocol handler.
@ -889,18 +834,6 @@ FunctionEnd
!macroend
!define ResetWin8PromptKeys "!insertmacro ResetWin8PromptKeys"
!ifdef MOZ_METRO
; Resets Win8+ Metro specific splash screen info. Relies
; on AppUserModelID.
!macro ResetWin8MetroSplash
${If} ${AtLeastWin8}
${AndIf} "$AppUserModelID" != ""
DeleteRegKey HKCR "Local Settings\Software\Microsoft\Windows\CurrentVersion\AppModel\SystemAppData\DefaultBrowser_NOPUBLISHERID\SplashScreen\DefaultBrowser_NOPUBLISHERID!$AppUserModelID"
${EndIf}
!macroend
!define ResetWin8MetroSplash "!insertmacro ResetWin8MetroSplash"
!endif
; Adds SE_RESTORE_NAME privs
!macro AcquireSERestoreName
StrCpy $R1 0
@ -1655,7 +1588,6 @@ Function SetAsDefaultAppUserHKCU
${SetStartMenuInternet} "HKCU"
${FixShellIconHandler} "HKCU"
${FixClassKeys} ; Does not use SHCTX
Call RegisterStartMenuTile
${EndIf}
${SetHandlers}

17
browser/installer/windows/nsis/uninstaller.nsi
View File

@ -84,9 +84,6 @@ VIAddVersionKey "OriginalFilename" "helper.exe"
!insertmacro RegCleanAppHandler
!insertmacro RegCleanMain
!insertmacro RegCleanUninstall
!ifdef MOZ_METRO
!insertmacro RemoveDEHRegistrationIfMatching
!endif
!insertmacro SetAppLSPCategories
!insertmacro SetBrandNameVars
!insertmacro UpdateShortcutAppModelIDs
@ -108,9 +105,6 @@ VIAddVersionKey "OriginalFilename" "helper.exe"
!insertmacro un.RegCleanMain
!insertmacro un.RegCleanUninstall
!insertmacro un.RegCleanProtocolHandler
!ifdef MOZ_METRO
!insertmacro un.RemoveDEHRegistrationIfMatching
!endif
!insertmacro un.RemoveQuotesFromPath
!insertmacro un.RemovePrecompleteEntries
!insertmacro un.SetAppLSPCategories
@ -284,23 +278,12 @@ Section "Uninstall"
${un.SetAppLSPCategories}
${EndIf}
!ifdef MOZ_METRO
${If} ${AtLeastWin8}
${un.CleanupMetroBrowserHandlerValues} ${DELEGATE_EXECUTE_HANDLER_ID} \
"FirefoxURL" \
"FirefoxHTML"
${EndIf}
${ResetWin8PromptKeys} "HKCU" ""
${ResetWin8MetroSplash}
!else
; The metro browser is not enabled by the mozconfig.
${If} ${AtLeastWin8}
${RemoveDEHRegistration} ${DELEGATE_EXECUTE_HANDLER_ID} \
$AppUserModelID \
"FirefoxURL" \
"FirefoxHTML"
${EndIf}
!endif
${un.RegCleanAppHandler} "FirefoxURL"
${un.RegCleanAppHandler} "FirefoxHTML"

14
browser/locales/Makefile.in
View File

@ -71,14 +71,8 @@ STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST)/$(PKG_INST_PATH)'; \
$(NULL)
endif
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt))
else
SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ddg
endif
SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins
# metro build call a searchplugins target for search engine plugins
.PHONY: searchplugins
SEARCHPLUGINS_TARGET := libs searchplugins
SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
# Some locale-specific search plugins may have preprocessor directives, but the
@ -88,12 +82,7 @@ PP_TARGETS += SEARCHPLUGINS
# Required for l10n.mk - defines a list of app sub dirs that should
# be included in langpack xpis.
ifdef MOZ_METRO
# metro build, include both app folders
DIST_SUBDIRS = browser metro
else
DIST_SUBDIRS = $(DIST_SUBDIR)
endif
include $(topsrcdir)/config/rules.mk
@ -138,9 +127,6 @@ endif
@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
ifdef MOZ_METRO
@$(MAKE) -C ../metro/locales AB_CD=$* XPI_NAME=locale-$*
endif
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe

2
browser/locales/en-US/chrome/browser/browser.dtd
View File

@ -812,8 +812,6 @@ just addresses the organization to follow, e.g. "This site is run by " -->
<!ENTITY appMenuSidebars.label "Sidebars">
<!ENTITY switchToMetroCmd2.label "Relaunch in &brandShortName; for Windows 8 Touch">
<!-- LOCALIZATION NOTE: (panicButton.view.mainTimeframeDesc, panicButton.view.5min, panicButton.view.2hr, panicButton.view.day):
The .mainTimeframeDesc string combined with any of the 3 others is meant to form a complete sentence, e.g. "Forget the last: Five minutes".
Please ensure that this remains the case in the translation. -->

4
browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
View File

@ -33,10 +33,6 @@ add-ons-button.label = Add-ons
# LOCALIZATION NOTE(add-ons-button.tooltiptext3): %S is the keyboard shortcut
add-ons-button.tooltiptext3 = Manage your add-ons (%S)
switch-to-metro-button2.label = Windows 8 Touch
# LOCALIZATION NOTE(switch-to-metro-button2.tooltiptext): %S is the brand short name
switch-to-metro-button2.tooltiptext = Relaunch in %S for Windows 8 Touch
preferences-button.label = Preferences
preferences-button.tooltiptext2 = Open preferences
preferences-button.tooltiptext.withshortcut = Open preferences (%S)

7
browser/locales/en-US/chrome/browser/preferences/advanced.dtd
View File

@ -74,13 +74,8 @@
<!ENTITY updateTab.label "Update">
<!ENTITY updateApp.label "&brandShortName; updates:">
<!-- Note either updateAuto1 is used or (updateAutoMetro and updateAutoDesktop),
so re-using accesss key in updateAuto1 is OK. updateAutoDesktop can be found
in preferences.properties -->
<!ENTITY updateAuto1.label "Automatically install updates (recommended: improved security)">
<!ENTITY updateAuto1.accesskey "A">
<!ENTITY updateAutoMetro.label "Automatically update from desktop and Windows 8 style &brandShortName;">
<!ENTITY updateAutoMetro.accesskey "s">
<!ENTITY updateCheck.label "Check for updates, but let me choose whether to install them">
<!ENTITY updateCheck.accesskey "C">
<!ENTITY updateManual.label "Never check for updates (not recommended: security risk)">
@ -89,8 +84,6 @@
<!ENTITY updateAutoAddonWarn.label "Warn me if this will disable any of my add-ons">
<!ENTITY updateAutoAddonWarn.accesskey "W">
<!ENTITY updateAutoMetroWarn.label "(Windows 8 style &brandShortName; does not check add-on compatibility)">
<!ENTITY updateHistory.label "Show Update History">
<!ENTITY updateHistory.accesskey "p">

5
browser/locales/en-US/chrome/browser/preferences/preferences.properties
View File

@ -136,11 +136,6 @@ actualDiskCacheSizeCalculated=Calculating web content cache size…
# %2$S = unit (MB, KB, etc.)
actualAppCacheSize=Your application cache is currently using %1$S %2$S of disk space
###Preferences::Advanced::Update
#LOCALIZATION NOTE: The next string is for updating in Windows 8 only instead of updateAuto1.label. %S = brandShortName
updateAutoDesktop.label=Automatically install updates from desktop %S
updateAutoDesktop.accessKey=A
syncUnlink.title=Do you want to unlink your device?
syncUnlink.label=This device will no longer be associated with your Sync account. All of your personal data, both on this device and in your Sync account, will remain intact.
syncUnlinkConfirm.label=Unlink

2
browser/locales/en-US/chrome/browser/syncSetup.dtd
View File

@ -33,8 +33,6 @@
<!ENTITY setup.choosePassword.accesskey "P">
<!ENTITY setup.confirmPassword.label "Confirm Password">
<!ENTITY setup.confirmPassword.accesskey "m">
<!ENTITY setup.setupMetro.label "Sync with Windows 8 style &brandShortName;">
<!ENTITY setup.setupMetro.accesskey "S">
<!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
joined with implicit white space, so spaces in the strings aren't necessary -->

5
browser/locales/en-US/profile/bookmarks.inc
View File

@ -37,9 +37,4 @@
# link title for https://www.mozilla.org/en-US/about/
#define firefox_about About Us
# LOCALIZATION NOTE (firefox_feedback):
# link title for browser feedback page
# currently used by Metro only: https://input.mozilla.org/feedback/metrofirefox
#define firefox_feedback Give Feedback
#unfilter emptyLines

Some files were not shown because too many files have changed in this diff Show More