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

chrome/browser/resources/history/history.js

Index: chrome/browser/resources/history/history.js
diff --git a/chrome/browser/resources/history/history.js b/chrome/browser/resources/history/history.js
index edfcd913ff7c094b404dd7e640bfa75fd73ce7c2..7ae0b6e159737b7e7c4908afb0958d1c7f4ee55d 100644
--- a/chrome/browser/resources/history/history.js
+++ b/chrome/browser/resources/history/history.js
@@ -1682,9 +1682,9 @@ HistoryView.prototype.updateFocusGrid_ = function() {
 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 =
@@ -1924,7 +1924,7 @@ function load() {
     });
   }
 
-  if (!loadTimeData.getBoolean('showDeleteVisitUI'))
+  if (loadTimeData.getBoolean('hideDeleteVisitUI'))
     $('remove-visit').hidden = true;
 
   searchField.addEventListener('search', doSearch);
@@ -1936,14 +1936,15 @@ function load() {
   });
 
   // Only show the controls if the command line switch is activated.

[Dan Beam, 2014/11/06 19:30:06]

// or the user is supervised.

[Marc Treib, 2014/11/07 10:16:42]

Done.

-  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;
+  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')) {

[Dan Beam, 2014/11/06 19:30:06]

nit: no curlies

[Marc Treib, 2014/11/07 10:16:42]

Done.

+    $('top-container').hidden = true;
+  }
 
   uber.setTitle(loadTimeData.getString('title'));