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

Side by Side Diff: chrome/browser/extensions/standard_management_policy_provider.cc

Issue 11415216: Make Blacklist::IsBlacklist asynchronous (it will need to be for safe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix another test Created 8 years 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/extensions/standard_management_policy_provider.h" 5 #include "chrome/browser/extensions/standard_management_policy_provider.h"
6 6
7 #include "chrome/browser/extensions/admin_policy.h" 7 #include "chrome/browser/extensions/admin_policy.h"
8 #include "chrome/browser/extensions/blacklist.h" 8 #include "chrome/browser/extensions/blacklist.h"
9 #include "chrome/browser/extensions/extension_prefs.h" 9 #include "chrome/browser/extensions/extension_prefs.h"
10 #include "chrome/browser/prefs/pref_service.h" 10 #include "chrome/browser/prefs/pref_service.h"
11 #include "chrome/common/extensions/extension.h" 11 #include "chrome/common/extensions/extension.h"
12 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
13 13
14 namespace extensions { 14 namespace extensions {
15 15
16 StandardManagementPolicyProvider::StandardManagementPolicyProvider( 16 StandardManagementPolicyProvider::StandardManagementPolicyProvider(
17 ExtensionPrefs* prefs, Blacklist* blacklist) 17 ExtensionPrefs* prefs)
18 : prefs_(prefs), blacklist_(blacklist) { 18 : prefs_(prefs) {
19 } 19 }
20 20
21 StandardManagementPolicyProvider::~StandardManagementPolicyProvider() { 21 StandardManagementPolicyProvider::~StandardManagementPolicyProvider() {
22 } 22 }
23 23
24 std::string 24 std::string
25 StandardManagementPolicyProvider::GetDebugPolicyProviderName() const { 25 StandardManagementPolicyProvider::GetDebugPolicyProviderName() const {
26 #ifdef NDEBUG 26 #ifdef NDEBUG
27 NOTREACHED(); 27 NOTREACHED();
28 return std::string(); 28 return std::string();
29 #else 29 #else
30 return "admin policy black/white/forcelist, via the ExtensionPrefs"; 30 return "admin policy black/white/forcelist, via the ExtensionPrefs";
31 #endif 31 #endif
32 } 32 }
33 33
34 bool StandardManagementPolicyProvider::UserMayLoad( 34 bool StandardManagementPolicyProvider::UserMayLoad(
35 const Extension* extension, 35 const Extension* extension,
36 string16* error) const { 36 string16* error) const {
37 bool is_google_blacklisted = blacklist_->IsBlacklisted(extension);
38 const base::ListValue* blacklist = 37 const base::ListValue* blacklist =
39 prefs_->pref_service()->GetList(prefs::kExtensionInstallDenyList); 38 prefs_->pref_service()->GetList(prefs::kExtensionInstallDenyList);
40 const base::ListValue* whitelist = 39 const base::ListValue* whitelist =
41 prefs_->pref_service()->GetList(prefs::kExtensionInstallAllowList); 40 prefs_->pref_service()->GetList(prefs::kExtensionInstallAllowList);
42 const base::ListValue* forcelist = 41 const base::ListValue* forcelist =
43 prefs_->pref_service()->GetList(prefs::kExtensionInstallForceList); 42 prefs_->pref_service()->GetList(prefs::kExtensionInstallForceList);
44 return admin_policy::UserMayLoad(is_google_blacklisted, blacklist, whitelist, 43 return admin_policy::UserMayLoad(
45 forcelist, extension, error); 44 blacklist, whitelist, forcelist, extension, error);
46 } 45 }
47 46
48 bool StandardManagementPolicyProvider::UserMayModifySettings( 47 bool StandardManagementPolicyProvider::UserMayModifySettings(
49 const Extension* extension, 48 const Extension* extension,
50 string16* error) const { 49 string16* error) const {
51 return admin_policy::UserMayModifySettings(extension, error); 50 return admin_policy::UserMayModifySettings(extension, error);
52 } 51 }
53 52
54 bool StandardManagementPolicyProvider::MustRemainEnabled( 53 bool StandardManagementPolicyProvider::MustRemainEnabled(
55 const Extension* extension, 54 const Extension* extension,
56 string16* error) const { 55 string16* error) const {
57 return admin_policy::MustRemainEnabled(extension, error); 56 return admin_policy::MustRemainEnabled(extension, error);
58 } 57 }
59 58
60 } // namespace extensions 59 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698