diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 14:54:56 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 14:54:56 +0000 |
| commit | dd7f27c0d5eb8500690ff02f22459f08c05de695 (patch) | |
| tree | 1fb3fda335b8772b67bbffa5c2f04bf31db762c3 /chrome/browser/translate | |
| parent | ec69826aac99fcadf7c619c49e26a253c98f7b94 (diff) | |
| download | chromium_src-dd7f27c0d5eb8500690ff02f22459f08c05de695.zip chromium_src-dd7f27c0d5eb8500690ff02f22459f08c05de695.tar.gz chromium_src-dd7f27c0d5eb8500690ff02f22459f08c05de695.tar.bz2 | |
Revert 103459 - Disable the error reporting option for secured URL.
When there is a translate error, we should not let users report them because the report includes the sercured URL which would get compromised.
BUG=98441
TEST=Make sure the option is always disabled for secured (httpS) urls, and always enabled otherwise...
Review URL: http://codereview.chromium.org/8080007
TBR=mad@chromium.org
Review URL: http://codereview.chromium.org/8086024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/translate')
| -rw-r--r-- | chrome/browser/translate/options_menu_model.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/translate/translate_manager.cc | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/chrome/browser/translate/options_menu_model.cc b/chrome/browser/translate/options_menu_model.cc index 45e4f26..fc3a59f 100644 --- a/chrome/browser/translate/options_menu_model.cc +++ b/chrome/browser/translate/options_menu_model.cc @@ -88,12 +88,6 @@ bool OptionsMenuModel::IsCommandIdEnabled(int command_id) const { return (!translate_infobar_delegate_->IsLanguageBlacklisted() && !translate_infobar_delegate_->IsSiteBlacklisted()); - case IDC_TRANSLATE_REPORT_BAD_LANGUAGE_DETECTION : { - // Until we have a secure URL for reporting language detection errors, - // we don't report errors that happened on secure URLs. - return !translate_infobar_delegate_->tab_contents()->controller(). - GetActiveEntry()->url().SchemeIsSecure(); - } default: break; } diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index 5805e0c..0adff98 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -583,8 +583,6 @@ void TranslateManager::RevertTranslation(TabContents* tab_contents) { void TranslateManager::ReportLanguageDetectionError(TabContents* tab_contents) { UMA_HISTOGRAM_COUNTS("Translate.ReportLanguageDetectionError", 1); GURL page_url = tab_contents->controller().GetActiveEntry()->url(); - // Report option should be disabled for secure URLs. - DCHECK(!page_url.SchemeIsSecure()); std::string report_error_url(kReportLanguageDetectionErrorURL); report_error_url += "?client=cr&action=langidc&u="; report_error_url += EscapeUrlEncodedData(page_url.spec(), true); |