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

Side by Side Diff: chrome/browser/extensions/api/preference/preference_helpers.cc

Issue 18341016: Add types.private.ChromeDirectSetting and Connect it to preferencesPrivate.googleGeolocationAccessE… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to Latest Created 7 years, 5 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
OLDNEW
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_helpers.h" 5 #include "chrome/browser/extensions/api/preference/preference_helpers.h"
6 6
7 #include "base/json/json_writer.h" 7 #include "base/json/json_writer.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/extensions/api/preference/preference_api.h" 10 #include "chrome/browser/extensions/api/preference/preference_api.h"
11 #include "chrome/browser/extensions/component_loader.h"
12 #include "chrome/browser/extensions/event_router.h" 11 #include "chrome/browser/extensions/event_router.h"
13 #include "chrome/browser/extensions/extension_prefs.h" 12 #include "chrome/browser/extensions/extension_prefs.h"
14 #include "chrome/browser/extensions/extension_service.h" 13 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/extensions/extension_system.h" 14 #include "chrome/browser/extensions/extension_system.h"
16 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/common/extensions/incognito_handler.h" 16 #include "chrome/common/extensions/incognito_handler.h"
18 17
19 namespace extensions { 18 namespace extensions {
20 namespace preference_helpers { 19 namespace preference_helpers {
21 20
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 if (!pref->IsExtensionModifiable()) 65 if (!pref->IsExtensionModifiable())
67 return kNotControllable; 66 return kNotControllable;
68 67
69 if (PreferenceAPI::Get(profile)->DoesExtensionControlPref( 68 if (PreferenceAPI::Get(profile)->DoesExtensionControlPref(
70 extension_id, 69 extension_id,
71 browser_pref, 70 browser_pref,
72 from_incognito_ptr)) { 71 from_incognito_ptr)) {
73 return kControlledByThisExtension; 72 return kControlledByThisExtension;
74 } 73 }
75 74
76 extensions::ComponentLoader* component_loader = 75 if (PreferenceAPI::Get(profile)->CanExtensionControlPref(extension_id,
77 profile->GetExtensionService()->component_loader();
78 if (component_loader->Exists(extension_id) ||
79 PreferenceAPI::Get(profile)->CanExtensionControlPref(extension_id,
80 browser_pref, 76 browser_pref,
81 incognito)) { 77 incognito)) {
82 return kControllableByThisExtension; 78 return kControllableByThisExtension;
83 } 79 }
84 80
85 return kControlledByOtherExtensions; 81 return kControlledByOtherExtensions;
86 } 82 }
87 83
88 void DispatchEventToExtensions( 84 void DispatchEventToExtensions(
89 Profile* profile, 85 Profile* profile,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 scoped_ptr<base::ListValue> args_copy(args->DeepCopy()); 133 scoped_ptr<base::ListValue> args_copy(args->DeepCopy());
138 scoped_ptr<Event> event(new Event(event_name, args_copy.Pass())); 134 scoped_ptr<Event> event(new Event(event_name, args_copy.Pass()));
139 event->restrict_to_profile = restrict_to_profile; 135 event->restrict_to_profile = restrict_to_profile;
140 router->DispatchEventToExtension(extension_id, event.Pass()); 136 router->DispatchEventToExtension(extension_id, event.Pass());
141 } 137 }
142 } 138 }
143 } 139 }
144 140
145 } // namespace preference_helpers 141 } // namespace preference_helpers
146 } // namespace extensions 142 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698