Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced Clear History... menu item in browser with Clear Private Data... item,

Browse Source 
which formerly lived in the Tools menu.

bug=329750
r=annie.sullivan@gmail.com
sr=ben@mozilla.org
ui-review=mconnor@mozilla.com


git-svn-id: svn://10.0.0.236/trunk@193025 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
joe%retrovirus.com
2006-03-27 02:10:02 +00:00
parent b1153b0f14
commit d0022a0cb2
4 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/browser/base/content/browser-menubar.inc
View File

@@ -362,8 +362,10 @@
command="Browser:ShowHistory"/>
<menuseparator id="startTabHistorySeparator"/>
<menuseparator hidden="true" id="endTabHistorySeparator"/>
<menuitem label="&historyClearCmd.label;"
command="Browser:ClearHistory"/>
<menuitem id="sanitizeItem"
accesskey="&clearPrivateDataCmd.accesskey;"
label="&clearPrivateDataCmd.label;"
key="key_sanitize" command="Tools:Sanitize"/>
</menupopup>
</menu>
#else
@@ -483,11 +485,6 @@
<menuitem accesskey="&pageInfoCmd.accesskey;" label="&pageInfoCmd.label;"
key="key_viewInfo" command="View:PageInfo"/>
#endif
<menuseparator id="sanitizeSeparator"/>
<menuitem id="sanitizeItem"
accesskey="&clearPrivateDataCmd.accesskey;"
label="&clearPrivateDataCmd.label;"
key="key_sanitize" command="Tools:Sanitize"/>
#ifndef XP_UNIX
<menuseparator id="prefSep"/>
<menuitem id="menu_preferences"

2
mozilla/browser/base/content/browser-sets.inc
View File

@@ -177,7 +177,7 @@
<command id="Browser:ShowHistory"
oncommand="PlacesCommandHook.showPlacesOrganizer(ORGANIZER_ROOT_HISTORY);"/>
<command id="Browser:SearchHistory" oncommand="HistoryMenu.showPlacesSearch();"/>
<command id="Browser:ClearHistory" oncommand="HistoryMenu.clearHistory();"/>
#endif
</commandset>

14
mozilla/browser/base/content/browser.js
View File

@@ -6275,7 +6275,7 @@ BookmarkAllTabsCommand.prototype = {
execute: function BATC_execute() {
LOG("BookmarkAllTabs.execute: IMPLEMENT ME");
},
}
};
BookmarkAllTabsCommand.NAME = "Browser:BookmarkAllTabs";
@@ -6449,17 +6449,6 @@ var HistoryMenu = {
// XXX The places view needs to be updated before this
// does something different than show history.
PlacesCommandHook.showPlacesOrganizer(ORGANIZER_ROOT_HISTORY);
},
/**
* Clears the browser history.
* (XXX This might be changed to show the Clear Private Data menu instead)
*/
clearHistory: function PHM_clearHistory() {
var globalHistory =
Cc["@mozilla.org/browser/global-history;2"].
getService(Ci.nsIBrowserHistory);
globalHistory.removeAllPages();
}
};
@@ -6564,4 +6553,3 @@ var BookmarksEventHandler = {
#include ../../../toolkit/content/debug.js
#endif

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

@@ -192,8 +192,6 @@
<!ENTITY historySearchCmd.accesskey "s">
<!ENTITY historyShowCmd.label "View All History...">
<!ENTITY historyShowCmd.accesskey "v">
<!ENTITY historyClearCmd.label "Clear History...">
<!ENTITY historyClearCmd.accesskey "c">
<!-- XXX remove below if places sticks -->
<!ENTITY goMenu.label "Go">
<!ENTITY goMenu.accesskey "g">