OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/managed_mode/managed_user_service.h" | 5 #include "chrome/browser/managed_mode/managed_user_service.h" |
6 | 6 |
7 #include "base/memory/ref_counted.h" | 7 #include "base/memory/ref_counted.h" |
8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
9 #include "base/sequenced_task_runner.h" | 9 #include "base/sequenced_task_runner.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 void ManagedUserService::URLFilterContext::SetManualURLs( | 97 void ManagedUserService::URLFilterContext::SetManualURLs( |
98 scoped_ptr<std::map<GURL, bool> > url_map) { | 98 scoped_ptr<std::map<GURL, bool> > url_map) { |
99 ui_url_filter_->SetManualURLs(url_map.get()); | 99 ui_url_filter_->SetManualURLs(url_map.get()); |
100 BrowserThread::PostTask( | 100 BrowserThread::PostTask( |
101 BrowserThread::IO, | 101 BrowserThread::IO, |
102 FROM_HERE, | 102 FROM_HERE, |
103 base::Bind(&ManagedModeURLFilter::SetManualURLs, | 103 base::Bind(&ManagedModeURLFilter::SetManualURLs, |
104 io_url_filter_, base::Owned(url_map.release()))); | 104 io_url_filter_, base::Owned(url_map.release()))); |
105 } | 105 } |
106 | 106 |
107 ManagedUserService::ManagedUserService(Profile* profile) : profile_(profile) { | 107 ManagedUserService::ManagedUserService(Profile* profile) |
| 108 : profile_(profile), startup_elevation_(false) { |
108 } | 109 } |
109 | 110 |
110 ManagedUserService::~ManagedUserService() { | 111 ManagedUserService::~ManagedUserService() { |
111 } | 112 } |
112 | 113 |
113 bool ManagedUserService::ProfileIsManaged() const { | 114 bool ManagedUserService::ProfileIsManaged() const { |
114 return profile_->GetPrefs()->GetBoolean(prefs::kProfileIsManaged); | 115 return profile_->GetPrefs()->GetBoolean(prefs::kProfileIsManaged); |
115 } | 116 } |
116 | 117 |
117 bool ManagedUserService::IsElevatedForWebContents( | 118 bool ManagedUserService::IsElevatedForWebContents( |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 PrefRegistrySyncable::UNSYNCABLE_PREF); | 153 PrefRegistrySyncable::UNSYNCABLE_PREF); |
153 registry->RegisterIntegerPref(prefs::kDefaultManagedModeFilteringBehavior, | 154 registry->RegisterIntegerPref(prefs::kDefaultManagedModeFilteringBehavior, |
154 ManagedModeURLFilter::BLOCK, | 155 ManagedModeURLFilter::BLOCK, |
155 PrefRegistrySyncable::UNSYNCABLE_PREF); | 156 PrefRegistrySyncable::UNSYNCABLE_PREF); |
156 registry->RegisterStringPref(prefs::kManagedModeLocalPassphrase, | 157 registry->RegisterStringPref(prefs::kManagedModeLocalPassphrase, |
157 std::string(), | 158 std::string(), |
158 PrefRegistrySyncable::UNSYNCABLE_PREF); | 159 PrefRegistrySyncable::UNSYNCABLE_PREF); |
159 registry->RegisterStringPref(prefs::kManagedModeLocalSalt, | 160 registry->RegisterStringPref(prefs::kManagedModeLocalSalt, |
160 std::string(), | 161 std::string(), |
161 PrefRegistrySyncable::UNSYNCABLE_PREF); | 162 PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 163 registry->RegisterBooleanPref(prefs::kManagedModeHasSeenSetupDialog, |
| 164 false, |
| 165 PrefRegistrySyncable::UNSYNCABLE_PREF); |
162 } | 166 } |
163 | 167 |
164 scoped_refptr<const ManagedModeURLFilter> | 168 scoped_refptr<const ManagedModeURLFilter> |
165 ManagedUserService::GetURLFilterForIOThread() { | 169 ManagedUserService::GetURLFilterForIOThread() { |
166 return url_filter_context_.io_url_filter(); | 170 return url_filter_context_.io_url_filter(); |
167 } | 171 } |
168 | 172 |
169 ManagedModeURLFilter* ManagedUserService::GetURLFilterForUIThread() { | 173 ManagedModeURLFilter* ManagedUserService::GetURLFilterForUIThread() { |
170 return url_filter_context_.ui_url_filter(); | 174 return url_filter_context_.ui_url_filter(); |
171 } | 175 } |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
478 profile_->GetPrefs()->GetDictionary(prefs::kManagedModeManualURLs); | 482 profile_->GetPrefs()->GetDictionary(prefs::kManagedModeManualURLs); |
479 scoped_ptr<std::map<GURL, bool> > url_map(new std::map<GURL, bool>()); | 483 scoped_ptr<std::map<GURL, bool> > url_map(new std::map<GURL, bool>()); |
480 for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) { | 484 for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) { |
481 bool allow = false; | 485 bool allow = false; |
482 bool result = it.value().GetAsBoolean(&allow); | 486 bool result = it.value().GetAsBoolean(&allow); |
483 DCHECK(result); | 487 DCHECK(result); |
484 (*url_map)[GURL(it.key())] = allow; | 488 (*url_map)[GURL(it.key())] = allow; |
485 } | 489 } |
486 url_filter_context_.SetManualURLs(url_map.Pass()); | 490 url_filter_context_.SetManualURLs(url_map.Pass()); |
487 } | 491 } |
OLD | NEW |