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

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

Issue 9690006: Move Proxy Settings API from chrome/browser/extensions to chrome/browser/eextensions/api/proxy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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) 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/extension_preference_api.h" 5 #include "chrome/browser/extensions/extension_preference_api.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "base/stringprintf.h" 12 #include "base/stringprintf.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
14 #include "chrome/browser/extensions/extension_event_router.h" 15 #include "chrome/browser/extensions/extension_event_router.h"
15 #include "chrome/browser/extensions/extension_preference_api_constants.h" 16 #include "chrome/browser/extensions/extension_preference_api_constants.h"
16 #include "chrome/browser/extensions/extension_preference_helpers.h" 17 #include "chrome/browser/extensions/extension_preference_helpers.h"
17 #include "chrome/browser/extensions/extension_prefs.h" 18 #include "chrome/browser/extensions/extension_prefs.h"
18 #include "chrome/browser/extensions/extension_prefs_scope.h" 19 #include "chrome/browser/extensions/extension_prefs_scope.h"
19 #include "chrome/browser/extensions/extension_proxy_api.h"
20 #include "chrome/browser/extensions/extension_service.h" 20 #include "chrome/browser/extensions/extension_service.h"
21 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/common/chrome_notification_types.h" 22 #include "chrome/common/chrome_notification_types.h"
23 #include "chrome/common/extensions/extension_error_utils.h" 23 #include "chrome/common/extensions/extension_error_utils.h"
24 #include "chrome/common/extensions/extension_permission_set.h" 24 #include "chrome/common/extensions/extension_permission_set.h"
25 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
26 #include "content/public/browser/notification_details.h" 26 #include "content/public/browser/notification_details.h"
27 #include "content/public/browser/notification_source.h" 27 #include "content/public/browser/notification_source.h"
28 28
29 namespace keys = extension_preference_api_constants; 29 namespace keys = extension_preference_api_constants;
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 std::make_pair(kPrefMapping[i].browser_pref, 207 std::make_pair(kPrefMapping[i].browser_pref,
208 kPrefMapping[i].permission); 208 kPrefMapping[i].permission);
209 std::string event_name = 209 std::string event_name =
210 base::StringPrintf(kOnPrefChangeFormat, 210 base::StringPrintf(kOnPrefChangeFormat,
211 kPrefMapping[i].extension_pref); 211 kPrefMapping[i].extension_pref);
212 event_mapping_[kPrefMapping[i].browser_pref] = 212 event_mapping_[kPrefMapping[i].browser_pref] =
213 std::make_pair(event_name, kPrefMapping[i].permission); 213 std::make_pair(event_name, kPrefMapping[i].permission);
214 } 214 }
215 DCHECK_EQ(arraysize(kPrefMapping), mapping_.size()); 215 DCHECK_EQ(arraysize(kPrefMapping), mapping_.size());
216 DCHECK_EQ(arraysize(kPrefMapping), event_mapping_.size()); 216 DCHECK_EQ(arraysize(kPrefMapping), event_mapping_.size());
217 RegisterPrefTransformer(prefs::kProxy, new ProxyPrefTransformer()); 217 RegisterPrefTransformer(prefs::kProxy,
218 new extensions::ProxyPrefTransformer());
218 RegisterPrefTransformer(prefs::kBlockThirdPartyCookies, 219 RegisterPrefTransformer(prefs::kBlockThirdPartyCookies,
219 new InvertBooleanTransformer()); 220 new InvertBooleanTransformer());
220 } 221 }
221 222
222 ~PrefMapping() { 223 ~PrefMapping() {
223 STLDeleteContainerPairSecondPointers(transformers_.begin(), 224 STLDeleteContainerPairSecondPointers(transformers_.begin(),
224 transformers_.end()); 225 transformers_.end());
225 } 226 }
226 227
227 void RegisterPrefTransformer(const std::string& browser_pref, 228 void RegisterPrefTransformer(const std::string& browser_pref,
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 } 513 }
513 514
514 std::string browser_pref; 515 std::string browser_pref;
515 if (!ValidateBrowserPref(pref_key, &browser_pref)) 516 if (!ValidateBrowserPref(pref_key, &browser_pref))
516 return false; 517 return false;
517 518
518 ExtensionPrefs* prefs = profile_->GetExtensionService()->extension_prefs(); 519 ExtensionPrefs* prefs = profile_->GetExtensionService()->extension_prefs();
519 prefs->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); 520 prefs->RemoveExtensionControlledPref(extension_id(), browser_pref, scope);
520 return true; 521 return true;
521 } 522 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_function_dispatcher.cc ('k') | chrome/browser/extensions/extension_proxy_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698