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

Unified Diff: chrome/browser/supervised_user/supervised_user_shared_settings_update.h

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 months 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_shared_settings_update.h
diff --git a/chrome/browser/managed_mode/managed_user_shared_settings_update.h b/chrome/browser/supervised_user/supervised_user_shared_settings_update.h
similarity index 61%
rename from chrome/browser/managed_mode/managed_user_shared_settings_update.h
rename to chrome/browser/supervised_user/supervised_user_shared_settings_update.h
index dcc9f418fa73456e9b41643e64d52464894c26e8..0ab673d7c741cb713921aebfa2361a9ea424c514 100644
--- a/chrome/browser/managed_mode/managed_user_shared_settings_update.h
+++ b/chrome/browser/supervised_user/supervised_user_shared_settings_update.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SHARED_SETTINGS_UPDATE_H_
-#define CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SHARED_SETTINGS_UPDATE_H_
+#ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SHARED_SETTINGS_UPDATE_H_
+#define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SHARED_SETTINGS_UPDATE_H_
#include <string>
@@ -15,39 +15,39 @@ namespace base {
class Value;
}
-class ManagedUserSharedSettingsService;
+class SupervisedUserSharedSettingsService;
-// Lets clients of ManagedUserSharedSettingsService change settings and wait for
-// the Sync server to acknowledge the change. The callback passed in the
+// Lets clients of SupervisedUserSharedSettingsService change settings and wait
+// for the Sync server to acknowledge the change. The callback passed in the
// constructor will be called with a true success value after the Sync server
// has flipped the acknowledgement flag for the setting. If another client
// changes the value in the mean time, the callback will be run with a false
// success value. If the object is destroyed before that, the callback will not
// be run. Note that any changes made to the setting will not be undone when
// destroying the object, even if the update was not successful or was canceled.
-class ManagedUserSharedSettingsUpdate {
+class SupervisedUserSharedSettingsUpdate {
public:
- ManagedUserSharedSettingsUpdate(
- ManagedUserSharedSettingsService* service,
- const std::string& mu_id,
+ SupervisedUserSharedSettingsUpdate(
+ SupervisedUserSharedSettingsService* service,
+ const std::string& su_id,
const std::string& key,
scoped_ptr<base::Value> value,
const base::Callback<void(bool)>& success_callback);
- ~ManagedUserSharedSettingsUpdate();
+ ~SupervisedUserSharedSettingsUpdate();
private:
typedef base::CallbackList<void(const std::string&, const std::string&)>
CallbackList;
- void OnSettingChanged(const std::string& mu_id,
+ void OnSettingChanged(const std::string& su_id,
const std::string& key);
- ManagedUserSharedSettingsService* service_;
- std::string mu_id_;
+ SupervisedUserSharedSettingsService* service_;
+ std::string su_id_;
std::string key_;
scoped_ptr<base::Value> value_;
base::Callback<void(bool)> callback_;
scoped_ptr<CallbackList::Subscription> subscription_;
};
-#endif // CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SHARED_SETTINGS_UPDATE_H_
+#endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SHARED_SETTINGS_UPDATE_H_

Powered by Google App Engine
This is Rietveld 408576698