Supervised users: if history recording is off, allow incognito and deleting history
commit6f959801c7ae3a9ff745220638032a03bbb57047
authortreib <treib@chromium.org>
Tue, 11 Nov 2014 12:21:24 +0000 (11 04:21 -0800)
committerCommit bot <commit-bot@chromium.org>
Tue, 11 Nov 2014 12:22:33 +0000 (11 12:22 +0000)
tree71c0243636fd4d42f68da0c095094ab8b1dc9571
parent9291040409959e3c1f3e9e333660d25c40fdd968
Supervised users: if history recording is off, allow incognito and deleting history

Some related cleanup:
- History UI: Properly distinguish profile->IsSupervised vs. prefs::kAllowDeletingBrowserHistory vs groupByDomain
- "New incognito window" in hotdog menu: Honor IncognitoModePrefs

BUG=232316

Review URL: https://codereview.chromium.org/697693004

Cr-Commit-Position: refs/heads/master@{#303627}
15 files changed:
chrome/browser/app_controller_mac.mm
chrome/browser/resources/history/history.js
chrome/browser/supervised_user/supervised_user_browsertest.cc
chrome/browser/supervised_user/supervised_user_constants.cc
chrome/browser/supervised_user/supervised_user_constants.h
chrome/browser/supervised_user/supervised_user_pref_store.cc
chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc
chrome/browser/supervised_user/supervised_user_service.cc
chrome/browser/supervised_user/supervised_user_service_browsertest.cc
chrome/browser/supervised_user/supervised_user_settings_service.cc
chrome/browser/supervised_user/supervised_user_settings_service.h
chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
chrome/browser/ui/toolbar/wrench_menu_model.cc
chrome/browser/ui/webui/history_ui.cc