Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(559)

Unified Diff: chrome/browser/supervised_user/supervised_user_service.cc

Issue 697693004: Supervised users: if history recording is off, allow incognito and deleting history (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/supervised_user/supervised_user_service.cc
diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc
index 39ef0a2baa3eeb7b5e1b6f361757cd7e17253179..0fe1f849baee13f673fbe6fd6f559a00a29c00e9 100644
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -11,6 +11,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_info_cache.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -455,8 +456,18 @@ syncer::ModelTypeSet SupervisedUserService::GetPreferredDataTypes() const {
}
void SupervisedUserService::OnHistoryRecordingStateChanged() {
- includes_sync_sessions_type_ =
+ bool record_history =
profile_->GetPrefs()->GetBoolean(prefs::kRecordHistory);
+ GetSettingsService()->SetLocalSetting(
+ supervised_users::kAllowDeletingBrowserHistory,
+ make_scoped_ptr(new base::FundamentalValue(!record_history)));
+ GetSettingsService()->SetLocalSetting(
+ supervised_users::kIncognitoModeAvailability,
+ make_scoped_ptr(new base::FundamentalValue(
+ record_history ? IncognitoModePrefs::DISABLED
+ : IncognitoModePrefs::ENABLED)));
+
+ includes_sync_sessions_type_ = record_history;
ProfileSyncServiceFactory::GetForProfile(profile_)
->ReconfigureDatatypeManager();
}

Powered by Google App Engine
This is Rietveld 408576698