Supervised users: if history recording is off, allow incognito and deleting history

chrome/browser/resources/history/history.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 <include src="../uber/uber_utils.js">
 <include src="history_focus_manager.js">
 
 ///////////////////////////////////////////////////////////////////////////////
 // Globals:
 /** @const */ var RESULTS_PER_PAGE = 150;
@@ skipping 1664 matching lines @@
   this.focusGrid_.setGrid(grid);
 };
 
 /**
  * Update the visibility of the page navigation buttons.
  * @private
  */
 HistoryView.prototype.updateNavBar_ = function() {
   this.updateRangeButtons_();
 
-  // Supervised users have the control bar on top, don't show it on the bottom
-  // as well.
-  if (!loadTimeData.getBoolean('isSupervisedProfile')) {
+  // If grouping by domain is enabled, there's a control bar on top, don't show
+  // the one on the bottom as well.
+  if (!loadTimeData.getBoolean('groupByDomain')) {
     $('newest-button').hidden = this.pageIndex_ == 0;
     $('newer-button').hidden = this.pageIndex_ == 0;
     $('older-button').hidden =
         this.model_.rangeInDays_ != HistoryModel.Range.ALL_TIME ||
         !this.model_.hasMoreResults();
   }
 };
 
 /**
  * Updates the visibility of the 'Clear browsing data' button.
@@ skipping 219 matching lines @@
   var mayRemoveVisits = loadTimeData.getBoolean('allowDeletingHistory');
   $('remove-visit').disabled = !mayRemoveVisits;
 
   if (mayRemoveVisits) {
     $('remove-visit').addEventListener('activate', function(e) {
       activeVisit.removeFromHistory();
       activeVisit = null;
     });
   }
 
-  if (!loadTimeData.getBoolean('showDeleteVisitUI'))
+  if (loadTimeData.getBoolean('hideDeleteVisitUI'))
     $('remove-visit').hidden = true;
 
   searchField.addEventListener('search', doSearch);
   $('search-button').addEventListener('click', doSearch);
 
   $('more-from-site').addEventListener('activate', function(e) {
     activeVisit.showMoreFromSite_();
     activeVisit = null;
   });
 
-  // Only show the controls if the command line switch is activated.
-  if (loadTimeData.getBoolean('groupByDomain') ||
-      loadTimeData.getBoolean('isSupervisedProfile')) {
-    // Hide the top container which has the "Clear browsing data" and "Remove
-    // selected entries" buttons since they're unavailable for supervised users.
-    $('top-container').hidden = true;
+  // Only show the controls if the command line switch is activated or the user
+  // is supervised.
+  if (loadTimeData.getBoolean('groupByDomain')) {
     $('history-page').classList.add('big-topbar-page');
     $('filter-controls').hidden = false;
   }
+  // Hide the top container which has the "Clear browsing data" and "Remove
+  // selected entries" buttons if deleting history is not allowed.
+  if (!loadTimeData.getBoolean('allowDeletingHistory'))
+    $('top-container').hidden = true;
 
   uber.setTitle(loadTimeData.getString('title'));
 
   // Adjust the position of the notification bar when the window size changes.
   window.addEventListener('resize',
       historyView.positionNotificationBar.bind(historyView));
 
   if (isMobileVersion()) {
     // Move the search box out of the header.
     var resultsDisplay = $('results-display');
@@ skipping 364 matching lines @@
     historyView.reload();
 }
 
 // Add handlers to HTML elements.
 document.addEventListener('DOMContentLoaded', load);
 
 // This event lets us enable and disable menu items before the menu is shown.
 document.addEventListener('canExecute', function(e) {
   e.canExecute = true;
 });