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

Side by Side Diff: chrome/browser/policy/managed_prefs_banner_base.cc

Issue 7171018: User Settings on CrOS now shows the managed banner for enrolled devices. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed comments. Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/policy/managed_prefs_banner_base.h" 5 #include "chrome/browser/policy/managed_prefs_banner_base.h"
6 6
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/prefs/pref_service.h" 8 #include "chrome/browser/prefs/pref_service.h"
9 #include "chrome/browser/prefs/pref_set_observer.h" 9 #include "chrome/browser/prefs/pref_set_observer.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
11 #include "content/common/notification_details.h" 11 #include "content/common/notification_details.h"
12 #include "content/common/notification_type.h" 12 #include "content/common/notification_type.h"
13 13
14 #if defined(OS_CHROMEOS)
15 #include "chrome/browser/chromeos/cros_settings_names.h"
16 #endif
17
18 namespace policy { 14 namespace policy {
19 15
20 ManagedPrefsBannerBase::ManagedPrefsBannerBase(PrefService* user_prefs, 16 ManagedPrefsBannerBase::ManagedPrefsBannerBase(PrefService* user_prefs,
21 OptionsPage page) { 17 OptionsPage page) {
22 Init(g_browser_process->local_state(), user_prefs, page); 18 Init(g_browser_process->local_state(), user_prefs, page);
23 } 19 }
24 20
25 ManagedPrefsBannerBase::ManagedPrefsBannerBase(PrefService* local_state, 21 ManagedPrefsBannerBase::ManagedPrefsBannerBase(PrefService* local_state,
26 PrefService* user_prefs, 22 PrefService* user_prefs,
27 OptionsPage page) { 23 OptionsPage page) {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 AddUserPref(prefs::kSafeBrowsingEnabled); 86 AddUserPref(prefs::kSafeBrowsingEnabled);
91 #if defined(GOOGLE_CHROME_BUILD) 87 #if defined(GOOGLE_CHROME_BUILD)
92 AddLocalStatePref(prefs::kMetricsReportingEnabled); 88 AddLocalStatePref(prefs::kMetricsReportingEnabled);
93 #endif 89 #endif
94 AddUserPref(prefs::kProxy); 90 AddUserPref(prefs::kProxy);
95 AddUserPref(prefs::kCloudPrintProxyEnabled); 91 AddUserPref(prefs::kCloudPrintProxyEnabled);
96 AddUserPref(prefs::kDownloadDefaultDirectory); 92 AddUserPref(prefs::kDownloadDefaultDirectory);
97 AddUserPref(prefs::kPromptForDownload); 93 AddUserPref(prefs::kPromptForDownload);
98 AddUserPref(prefs::kEnableTranslate); 94 AddUserPref(prefs::kEnableTranslate);
99 break; 95 break;
100 #if defined(OS_CHROMEOS)
101 case OPTIONS_PAGE_ACCOUNTS:
102 AddLocalStatePref(chromeos::kAccountsPrefAllowGuest);
103 AddLocalStatePref(chromeos::kAccountsPrefAllowNewUser);
104 AddLocalStatePref(chromeos::kAccountsPrefShowUserNamesOnSignIn);
105 AddLocalStatePref(chromeos::kAccountsPrefUsers);
106 AddLocalStatePref(chromeos::kSystemTimezone);
107 break;
108 #endif
109 default: 96 default:
110 NOTREACHED(); 97 NOTREACHED();
111 } 98 }
112 } 99 }
113 100
114 void ManagedPrefsBannerBase::Observe(NotificationType type, 101 void ManagedPrefsBannerBase::Observe(NotificationType type,
115 const NotificationSource& source, 102 const NotificationSource& source,
116 const NotificationDetails& details) { 103 const NotificationDetails& details) {
117 if (NotificationType::PREF_CHANGED == type) { 104 if (NotificationType::PREF_CHANGED == type) {
118 std::string* pref = Details<std::string>(details).ptr(); 105 std::string* pref = Details<std::string>(details).ptr();
119 if (pref && (local_state_set_->IsObserved(*pref) || 106 if (pref && (local_state_set_->IsObserved(*pref) ||
120 user_pref_set_->IsObserved(*pref))) 107 user_pref_set_->IsObserved(*pref)))
121 OnUpdateVisibility(); 108 OnUpdateVisibility();
122 } 109 }
123 } 110 }
124 111
125 } // namespace policy 112 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/user_cros_settings_provider.cc ('k') | chrome/browser/resources/options/chromeos/accounts_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698