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

Backout of changesets c866e73f3209 and baff7b7b32bc because of sicking's push-and-run bustage. a=backout

Browse Source
This commit is contained in:
Bobby Holley 2010-08-20 23:42:24 -04:00
parent 73b81ff44d
commit ae9d0e0ff2
7 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2604,6 +2604,11 @@ function BrowserOnClick(event) {
);
}
}
else if (/^about:privatebrowsing/.test(errorDoc.documentURI)) {
if (ot == errorDoc.getElementById("startPrivateBrowsing")) {
gPrivateBrowsingUI.toggleMode();
}
}
}
/**

9
browser/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
View File

@ -114,10 +114,6 @@
if (moreInfoLink)
moreInfoLink.setAttribute("href", moreInfoURL + "private-browsing");
}, false);
function togglePrivateBrowsing() {
mainWindow.gPrivateBrowsingUI.toggleMode();
}
]]></script>
</head>
@ -149,10 +145,9 @@
<!-- Start Private Browsing -->
<div id="startPrivateBrowsingDesc" class="showNormal">
<button xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="startPrivateBrowsing" label="&privatebrowsingpage.startPrivateBrowsing.label;"
<button id="startPrivateBrowsing"
accesskey="&privatebrowsingpage.startPrivateBrowsing.accesskey;"
oncommand="togglePrivateBrowsing();"/>
>&privatebrowsingpage.startPrivateBrowsing.label;</button>
</div>
<!-- Footer -->

10
browser/locales/en-US/chrome/overrides/netError.dtd
View File

@ -170,12 +170,12 @@ be temporary, and you can try again later.</li>
<!ENTITY securityOverride.getMeOutOfHereButton "Get me out of here!">
<!ENTITY securityOverride.exceptionButtonLabel "Add Exception…">
<!-- LOCALIZATION NOTE (securityOverride.warningContent) - Do not translate the
contents of the <button> tags. It uses strings already defined above. The
button is included here (instead of netError.xhtml) because it exposes
functionality specific to firefox. -->
<!-- LOCALIZATION NOTE (securityOverride.warningText) - Do not translate the
contents of the <xul:button> tags. The only language content is the label= field,
which uses strings already defined above. The button is included here (instead of
netError.xhtml) because it exposes functionality specific to firefox. -->
<!ENTITY securityOverride.warningContent "
<!ENTITY securityOverride.warningText "
<p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p>
<button id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button>

1
build/automation.py.in
View File

@ -294,7 +294,6 @@ class Automation(object):
# Open database and create table
permDB = sqlite3.connect(os.path.join(profileDir, "permissions.sqlite"))
cursor = permDB.cursor();
// SQL copied from nsPermissionManager.cpp
cursor.execute("""CREATE TABLE moz_hosts (
id INTEGER PRIMARY KEY,
host TEXT,

2
docshell/resources/content/netError.xhtml
View File

@ -369,7 +369,7 @@
error types. -->
<div id="securityOverrideDiv">
<a id="securityOverrideLink" href="javascript:showSecuritySection();" >&securityOverride.linkText;</a>
<div id="securityOverrideContent" style="display: none;">&securityOverride.warningContent;</div>
<div id="securityOverrideContent" style="display: none;">&securityOverride.warningText;</div>
</div>
</div>

2
dom/locales/en-US/chrome/netErrorApp.dtd
View File

@ -3,7 +3,7 @@
should go into netError.dtd -->
<!ENTITY securityOverride.linkText "Or you can add an exception…">
<!ENTITY securityOverride.warningContent "
<!ENTITY securityOverride.warningText "
<p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p>
<p>If you still wish to add an exception for this site, you can do so in your advanced encryption settings.</p>
">

2
extensions/cookie/nsPermissionManager.cpp
View File

@ -343,8 +343,6 @@ nsPermissionManager::CreateTable()
if (NS_FAILED(rv)) return rv;
// create the table
// SQL also lives in automation.py.in. If you change this SQL change that
// one too.
return mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
"CREATE TABLE moz_hosts ("
" id INTEGER PRIMARY KEY"