From d0022a0cb2a312196f608d7f7dcd49a46d15d059 Mon Sep 17 00:00:00 2001
From: "joe%retrovirus.com"
 <joe%retrovirus.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 27 Mar 2006 02:10:02 +0000
Subject: [PATCH] Replaced Clear History... menu item in browser with Clear
 Private Data... item, 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
---
 mozilla/browser/base/content/browser-menubar.inc   | 11 ++++-------
 mozilla/browser/base/content/browser-sets.inc      |  2 +-
 mozilla/browser/base/content/browser.js            | 14 +-------------
 .../locales/en-US/chrome/browser/browser.dtd       |  2 --
 4 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/mozilla/browser/base/content/browser-menubar.inc b/mozilla/browser/base/content/browser-menubar.inc
index 30a09983b26..750ca7eabfb 100644
--- a/mozilla/browser/base/content/browser-menubar.inc
+++ b/mozilla/browser/base/content/browser-menubar.inc
@@ -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"
diff --git a/mozilla/browser/base/content/browser-sets.inc b/mozilla/browser/base/content/browser-sets.inc
index 2daa0df4079..4ac3715de41 100644
--- a/mozilla/browser/base/content/browser-sets.inc
+++ b/mozilla/browser/base/content/browser-sets.inc
@@ -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>
 
diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index 395af7a22ea..4052ab4d1f4 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -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
-
diff --git a/mozilla/browser/locales/en-US/chrome/browser/browser.dtd b/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
index 47eeaa51814..929d1ada8b8 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
@@ -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">