| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_proxy_api.h" | 5 #include "chrome/browser/extensions/extension_proxy_api.h" |
| 6 | 6 |
| 7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
| 8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "chrome/browser/prefs/proxy_prefs.h" | 10 #include "chrome/browser/prefs/proxy_prefs.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 } | 164 } |
| 165 } | 165 } |
| 166 | 166 |
| 167 ApplyPreference(prefs::kProxyServer, Value::CreateStringValue(proxy_pref)); | 167 ApplyPreference(prefs::kProxyServer, Value::CreateStringValue(proxy_pref)); |
| 168 return true; | 168 return true; |
| 169 } | 169 } |
| 170 | 170 |
| 171 void UseCustomProxySettingsFunction::ApplyPreference(const char* pref_path, | 171 void UseCustomProxySettingsFunction::ApplyPreference(const char* pref_path, |
| 172 Value* pref_value) { | 172 Value* pref_value) { |
| 173 profile()->GetExtensionService()->extension_prefs() | 173 profile()->GetExtensionService()->extension_prefs() |
| 174 ->SetExtensionControlledPref(extension_id(), pref_path, pref_value); | 174 ->SetExtensionControlledPref(extension_id(), pref_path, false, |
| 175 pref_value); |
| 175 } | 176 } |
| OLD | NEW |