diff options
| author | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 18:15:24 +0000 |
|---|---|---|
| committer | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 18:15:24 +0000 |
| commit | 140fb63d76e0970bf03eea5485416ca1f5398833 (patch) | |
| tree | a6e85904a37d9311607045ca0c4975fcb9110490 | |
| parent | deda7df73efea23971b39173392b29583f5c97d3 (diff) | |
| download | chromium_src-140fb63d76e0970bf03eea5485416ca1f5398833.zip chromium_src-140fb63d76e0970bf03eea5485416ca1f5398833.tar.gz chromium_src-140fb63d76e0970bf03eea5485416ca1f5398833.tar.bz2 | |
dom-ui settings: Changes not to assume the existance of a preference, eliminates two coverity issues.
CID=12683,12686
BUG=none
TEST=Test 'under the hood' panel displays correctly when extension controls proxy prefs.
Review URL: http://codereview.chromium.org/3535001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61082 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/dom_ui/advanced_options_handler.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/dom_ui/advanced_options_handler.cc b/chrome/browser/dom_ui/advanced_options_handler.cc index 778dab6..cb727f5 100644 --- a/chrome/browser/dom_ui/advanced_options_handler.cc +++ b/chrome/browser/dom_ui/advanced_options_handler.cc @@ -366,14 +366,15 @@ void AdvancedOptionsHandler::SetupProxySettingsSection() { PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs(); const PrefService::Preference* proxy_server = pref_service->FindPreference(prefs::kProxyServer); - DCHECK(proxy_server); + bool is_extension_controlled = (proxy_server && + proxy_server->IsExtensionControlled()); FundamentalValue disabled(proxy_prefs_->IsManaged() || - proxy_server->IsExtensionControlled()); + is_extension_controlled); // Get the appropriate info string to describe the button. string16 label_str; - if (proxy_server->IsExtensionControlled()) { + if (is_extension_controlled) { label_str = l10n_util::GetStringUTF16(IDS_OPTIONS_EXTENSION_PROXIES_LABEL); } else { label_str = l10n_util::GetStringFUTF16(IDS_OPTIONS_SYSTEM_PROXIES_LABEL, |