Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / supervised_user / supervised_user_pref_store.cc

diff --git a/src/chrome/browser/supervised_user/supervised_user_pref_store.cc b/src/chrome/browser/supervised_user/supervised_user_pref_store.cc
index 5d0dab4..3f981d4 100644 (file)
--- a/src/chrome/browser/supervised_user/supervised_user_pref_store.cc
+++ b/src/chrome/browser/supervised_user/supervised_user_pref_store.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/supervised_user/supervised_user_pref_store.h"
 
+#include <vector>
+
 #include "base/bind.h"
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
@@ -36,16 +38,16 @@ SupervisedUserSettingsPrefMappingEntry kSupervisedUserSettingsPrefMapping[] = {
     prefs::kSupervisedUserManualURLs,
   },
   {
-    supervised_users::kForceSafeSearch,
-    prefs::kForceSafeSearch,
+    supervised_users::kForceSafeSearch, prefs::kForceSafeSearch,
+  },
+  {
+    supervised_users::kRecordHistory, prefs::kRecordHistory,
   },
   {
-    supervised_users::kSigninAllowed,
-    prefs::kSigninAllowed,
+    supervised_users::kSigninAllowed, prefs::kSigninAllowed,
   },
   {
-    supervised_users::kUserName,
-    prefs::kProfileName,
+    supervised_users::kUserName, prefs::kProfileName,
   },
 };
 
@@ -95,6 +97,7 @@ void SupervisedUserPrefStore::OnNewSettingsAvailable(
     prefs_->SetValue(prefs::kDefaultSupervisedUserFilteringBehavior,
                      new FundamentalValue(SupervisedUserURLFilter::ALLOW));
     prefs_->SetValue(prefs::kForceSafeSearch, new FundamentalValue(true));
+    prefs_->SetValue(prefs::kRecordHistory, new FundamentalValue(true));
     prefs_->SetValue(prefs::kHideWebStoreIcon, new FundamentalValue(true));
     prefs_->SetValue(prefs::kIncognitoModeAvailability,
                      new FundamentalValue(IncognitoModePrefs::DISABLED));
@@ -119,9 +122,7 @@ void SupervisedUserPrefStore::OnNewSettingsAvailable(
   prefs_->GetDifferingKeys(old_prefs.get(), &changed_prefs);
 
   // Send out change notifications.
-  for (std::vector<std::string>::const_iterator pref(changed_prefs.begin());
-       pref != changed_prefs.end();
-       ++pref) {
-    FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(*pref));
+  for (const std::string& pref : changed_prefs) {
+    FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(pref));
   }
 }