OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/api/preference/preference_api.h" | 5 #include "chrome/browser/extensions/api/preference/preference_api.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "content/public/browser/notification_source.h" | 26 #include "content/public/browser/notification_source.h" |
27 #include "extensions/browser/extension_pref_value_map.h" | 27 #include "extensions/browser/extension_pref_value_map.h" |
28 #include "extensions/browser/extension_pref_value_map_factory.h" | 28 #include "extensions/browser/extension_pref_value_map_factory.h" |
29 #include "extensions/browser/extension_prefs.h" | 29 #include "extensions/browser/extension_prefs.h" |
30 #include "extensions/browser/extension_prefs_factory.h" | 30 #include "extensions/browser/extension_prefs_factory.h" |
31 #include "extensions/browser/extension_system_provider.h" | 31 #include "extensions/browser/extension_system_provider.h" |
32 #include "extensions/browser/extensions_browser_client.h" | 32 #include "extensions/browser/extensions_browser_client.h" |
33 #include "extensions/browser/pref_names.h" | 33 #include "extensions/browser/pref_names.h" |
34 #include "extensions/common/error_utils.h" | 34 #include "extensions/common/error_utils.h" |
35 #include "extensions/common/permissions/api_permission.h" | 35 #include "extensions/common/permissions/api_permission.h" |
| 36 #include "extensions/common/permissions/permissions_data.h" |
36 | 37 |
37 namespace keys = extensions::preference_api_constants; | 38 namespace keys = extensions::preference_api_constants; |
38 namespace helpers = extensions::preference_helpers; | 39 namespace helpers = extensions::preference_helpers; |
39 | 40 |
40 using base::DictionaryValue; | 41 using base::DictionaryValue; |
41 | 42 |
42 namespace extensions { | 43 namespace extensions { |
43 | 44 |
44 namespace { | 45 namespace { |
45 | 46 |
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
505 APIPermission::ID write_permission = APIPermission::kInvalid; | 506 APIPermission::ID write_permission = APIPermission::kInvalid; |
506 EXTENSION_FUNCTION_VALIDATE( | 507 EXTENSION_FUNCTION_VALIDATE( |
507 PrefMapping::GetInstance()->FindBrowserPrefForExtensionPref( | 508 PrefMapping::GetInstance()->FindBrowserPrefForExtensionPref( |
508 extension_pref_key, | 509 extension_pref_key, |
509 browser_pref_key, | 510 browser_pref_key, |
510 &read_permission, | 511 &read_permission, |
511 &write_permission)); | 512 &write_permission)); |
512 APIPermission::ID permission = permission_type == PERMISSION_TYPE_READ | 513 APIPermission::ID permission = permission_type == PERMISSION_TYPE_READ |
513 ? read_permission | 514 ? read_permission |
514 : write_permission; | 515 : write_permission; |
515 if (!GetExtension()->HasAPIPermission(permission)) { | 516 if (!GetExtension()->permissions_data()->HasAPIPermission(permission)) { |
516 error_ = ErrorUtils::FormatErrorMessage( | 517 error_ = ErrorUtils::FormatErrorMessage( |
517 keys::kPermissionErrorMessage, extension_pref_key); | 518 keys::kPermissionErrorMessage, extension_pref_key); |
518 return false; | 519 return false; |
519 } | 520 } |
520 return true; | 521 return true; |
521 } | 522 } |
522 | 523 |
523 GetPreferenceFunction::~GetPreferenceFunction() { } | 524 GetPreferenceFunction::~GetPreferenceFunction() { } |
524 | 525 |
525 bool GetPreferenceFunction::RunSync() { | 526 bool GetPreferenceFunction::RunSync() { |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
706 pref_key, PreferenceFunction::PERMISSION_TYPE_WRITE, &browser_pref)) { | 707 pref_key, PreferenceFunction::PERMISSION_TYPE_WRITE, &browser_pref)) { |
707 return false; | 708 return false; |
708 } | 709 } |
709 | 710 |
710 PreferenceAPI::Get(GetProfile()) | 711 PreferenceAPI::Get(GetProfile()) |
711 ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); | 712 ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); |
712 return true; | 713 return true; |
713 } | 714 } |
714 | 715 |
715 } // namespace extensions | 716 } // namespace extensions |
OLD | NEW |