summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 07:23:01 +0000
committerdpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 07:23:01 +0000
commit5435880eb6a88eade21fd165a17a5d6dd6106da9 (patch)
tree4f28c4c9b37f976908779c1481bf3fdc4e676eca
parent19ffb7df15fbe0e68f9af32fd8f049a6f38b5ba7 (diff)
downloadchromium_src-5435880eb6a88eade21fd165a17a5d6dd6106da9.zip
chromium_src-5435880eb6a88eade21fd165a17a5d6dd6106da9.tar.gz
chromium_src-5435880eb6a88eade21fd165a17a5d6dd6106da9.tar.bz2
Don't show non-localized detailed error info in bubbles.
BUG=chromium-os:5600 TEST=On Chrome OS login screen enter wrong password. Review URL: http://codereview.chromium.org/3111009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56492 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/login/existing_user_controller.cc6
-rw-r--r--chrome/browser/chromeos/login/login_screen.cc6
2 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index 6907a3c..4cc5316 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -351,8 +351,10 @@ void ExistingUserController::ShowError(int error_id,
const std::string& details) {
ClearErrors();
std::wstring error_text = l10n_util::GetString(error_id);
- if (!details.empty())
- error_text += L"\n" + ASCIIToWide(details);
+ // TODO(dpolukhin): show detailed error info. |details| string contains
+ // low level error info that is not localized and even is not user friendly.
+ // For now just ignore it because error_text contains all required information
+ // for end users, developers can see details string in Chrome logs.
bubble_ = MessageBubble::Show(
controllers_[selected_view_index_]->controls_window(),
controllers_[selected_view_index_]->GetScreenBounds(),
diff --git a/chrome/browser/chromeos/login/login_screen.cc b/chrome/browser/chromeos/login/login_screen.cc
index f150163..7aea84a 100644
--- a/chrome/browser/chromeos/login/login_screen.cc
+++ b/chrome/browser/chromeos/login/login_screen.cc
@@ -111,8 +111,10 @@ void LoginScreen::AppendStartUrlToCmdline() {
void LoginScreen::ShowError(int error_id, const std::string& details) {
ClearErrors();
std::wstring error_text = l10n_util::GetString(error_id);
- if (!details.empty())
- error_text += L"\n" + ASCIIToWide(details);
+ // TODO(dpolukhin): show detailed error info. |details| string contains
+ // low level error info that is not localized and even is not user friendly.
+ // For now just ignore it because error_text contains all required information
+ // for end users, developers can see details string in Chrome logs.
bubble_ = MessageBubble::Show(
view()->GetWidget(),
view()->GetPasswordBounds(),