summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorcsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-31 23:13:35 +0000
committercsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-31 23:13:35 +0000
commit87949cc2b85979964ca9de9483ba1ba2758e0b81 (patch)
treef6b6a246c3efdb4d2b17898b227b04054513b25d /chrome
parent18ddc84cfb292bcc8e8bf87d7559edc31c5217d0 (diff)
downloadchromium_src-87949cc2b85979964ca9de9483ba1ba2758e0b81.zip
chromium_src-87949cc2b85979964ca9de9483ba1ba2758e0b81.tar.gz
chromium_src-87949cc2b85979964ca9de9483ba1ba2758e0b81.tar.bz2
dom-ui options: Eliminate redundant DCHECKs (eliminates Coverity issue.)
BUG=none TEST=Verify advanced_options_handler.cc has no coverity errors. Review URL: http://codereview.chromium.org/3261005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/dom_ui/advanced_options_handler.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/dom_ui/advanced_options_handler.cc b/chrome/browser/dom_ui/advanced_options_handler.cc
index 92d26f2..c5b8909 100644
--- a/chrome/browser/dom_ui/advanced_options_handler.cc
+++ b/chrome/browser/dom_ui/advanced_options_handler.cc
@@ -136,6 +136,7 @@ void AdvancedOptionsHandler::GetLocalizedValues(
}
void AdvancedOptionsHandler::Initialize() {
+ DCHECK(dom_ui_);
SetupDownloadLocationPath();
SetupAutoOpenFileTypesDisabledAttribute();
SetupProxySettingsSection();
@@ -240,7 +241,6 @@ void AdvancedOptionsHandler::FileSelected(const FilePath& path, int index,
void AdvancedOptionsHandler::HandleAutoOpenButton(const ListValue* args) {
UserMetricsRecordAction(UserMetricsAction("Options_ResetAutoOpenFiles"),
NULL);
- DCHECK(dom_ui_);
DownloadManager* manager = dom_ui_->GetProfile()->GetDownloadManager();
if (manager)
manager->download_prefs()->ResetAutoOpen();
@@ -280,20 +280,17 @@ void AdvancedOptionsHandler::HandleShowGearsSettings(const ListValue* args) {
#if !defined(OS_CHROMEOS)
void AdvancedOptionsHandler::ShowNetworkProxySettings(const ListValue* args) {
UserMetricsRecordAction(UserMetricsAction("Options_ShowProxySettings"), NULL);
- DCHECK(dom_ui_);
AdvancedOptionsUtilities::ShowNetworkProxySettings(dom_ui_->tab_contents());
}
void AdvancedOptionsHandler::ShowManageSSLCertificates(const ListValue* args) {
UserMetricsRecordAction(UserMetricsAction("Options_ManageSSLCertificates"),
NULL);
- DCHECK(dom_ui_);
AdvancedOptionsUtilities::ShowManageSSLCertificates(dom_ui_->tab_contents());
}
#endif
void AdvancedOptionsHandler::SetupDownloadLocationPath() {
- DCHECK(dom_ui_);
StringValue value(default_download_location_.GetValue().value());
dom_ui_->CallJavascriptFunction(
L"options.AdvancedOptions.SetDownloadLocationPath", value);
@@ -302,7 +299,6 @@ void AdvancedOptionsHandler::SetupDownloadLocationPath() {
void AdvancedOptionsHandler::SetupAutoOpenFileTypesDisabledAttribute() {
// Set the enabled state for the AutoOpenFileTypesResetToDefault button.
// We enable the button if the user has any auto-open file types registered.
- DCHECK(dom_ui_);
DownloadManager* manager = dom_ui_->GetProfile()->GetDownloadManager();
bool disabled = !(manager && manager->download_prefs()->IsAutoOpenUsed());
FundamentalValue value(disabled);
@@ -337,7 +333,6 @@ void AdvancedOptionsHandler::SetupProxySettingsSection() {
#if defined(OS_WIN)
void AdvancedOptionsHandler::SetupSSLConfigSettings() {
- DCHECK(dom_ui_);
bool checkRevocationSetting = false;
bool useSSLSetting = false;