diff options
author | davidyu <davidyu@chromium.org> | 2014-09-10 22:33:00 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-11 05:37:31 +0000 |
commit | 51ffb80c42001d78b3728e9b13cac6fd57b1a6fc (patch) | |
tree | 19d8b27dff63266fa693059f5b991e9f481436b0 /chrome/common/pref_names.h | |
parent | 823300b5d549a31dcfe99677a4bb54cc816c6ea5 (diff) | |
download | chromium_src-51ffb80c42001d78b3728e9b13cac6fd57b1a6fc.zip chromium_src-51ffb80c42001d78b3728e9b13cac6fd57b1a6fc.tar.gz chromium_src-51ffb80c42001d78b3728e9b13cac6fd57b1a6fc.tar.bz2 |
Add an enrolling state for consumer management section in settings page.
When the enrollment is in progress, the button shows "Enrolling..." and is
disabled.
Also made BrowserOptionsHandler an observer of ConsumerManagementService, so
that the settings page is updated when the enrollment state is changed.
BUG=chromium:353050
TEST=unit_tests
Review URL: https://codereview.chromium.org/493613002
Cr-Commit-Position: refs/heads/master@{#294323}
Diffstat (limited to 'chrome/common/pref_names.h')
-rw-r--r-- | chrome/common/pref_names.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 26e95e7..8b03da3 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -678,7 +678,7 @@ extern const char kUsedPolicyCertificates[]; extern const char kServerBackedDeviceState[]; extern const char kCustomizationDefaultWallpaperURL[]; extern const char kLogoutStartedLast[]; -extern const char kConsumerManagementEnrollmentState[]; +extern const char kConsumerManagementEnrollmentStage[]; #endif extern const char kClearPluginLSODataEnabled[]; |