Merge pull request #5251 from maaz93/single-history-clear

Removing clear cache and clear site data options from the history menu
brave · Oct 30, 2016 · 3368def · 3368def
2 parents 3649f29 + a3aebb1
commit 3368def
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/app/browser/menu.js b/app/browser/menu.js
@@ -322,21 +322,11 @@ const createHistorySubmenu = () => {
     CommonMenu.separatorMenuItem,
     */
     {
-      label: locale.translation('clearHistory'),
+      label: locale.translation('clearBrowsingData'),
       accelerator: 'Shift+CmdOrCtrl+Delete',
       click: function (item, focusedWindow) {
         CommonMenu.sendToFocusedWindow(focusedWindow, [messages.SHORTCUT_OPEN_CLEAR_BROWSING_DATA_PANEL, {browserHistory: true}])
       }
-    }, {
-      label: locale.translation('clearCache'),
-      click: function (item, focusedWindow) {
-        CommonMenu.sendToFocusedWindow(focusedWindow, [messages.SHORTCUT_OPEN_CLEAR_BROWSING_DATA_PANEL, {cachedImagesAndFiles: true}])
-      }
-    }, {
-      label: locale.translation('clearSiteData'),
-      click: function (item, focusedWindow) {
-        CommonMenu.sendToFocusedWindow(focusedWindow, [messages.SHORTCUT_OPEN_CLEAR_BROWSING_DATA_PANEL, {allSiteCookies: true, cachedImagesAndFiles: true}])
-      }
     }
   ]
   submenu = submenu.concat(menuUtil.createRecentlyClosedMenuItems(Immutable.fromJS(Object.keys(closedFrames).map(key => closedFrames[key]))))

diff --git a/app/extensions/brave/locales/en-US/menu.properties b/app/extensions/brave/locales/en-US/menu.properties
@@ -51,6 +51,7 @@ back=Back
 forward=Forward
 reopenLastClosedWindow=Reopen Last Closed Window
 showAllHistory=Show History
+clearBrowsingData=Clear Browsing Data…
 clearHistory=Clear History…
 clearCache=Clear Cache…
 clearSiteData=Clear All Cookies and Site Data…

diff --git a/app/locale.js b/app/locale.js
@@ -121,6 +121,7 @@ var rendererIdentifiers = function () {
     'clearCache',
     'clearHistory',
     'clearSiteData',
+    'clearBrowsingData',
     'recentlyClosed',
     'recentlyVisited',
     'bookmarks',