views: Fix the button's label of the question message box.

chrome/browser/ui/views/simple_message_box_views.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/simple_message_box.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
@@ skipping 136 matching lines @@
   views::Widget::CreateWindowWithParent(this, parent_window)->Show();
 
   // Add reference to be released in DeleteDelegate().
   AddRef();
 }
 
 SimpleMessageBoxViews::~SimpleMessageBoxViews() {
 }
 
 int SimpleMessageBoxViews::GetDialogButtons() const {
-  if (dialog_type_ == DIALOG_TYPE_INFORMATION ||
-      dialog_type_ == DIALOG_TYPE_WARNING)
-    return ui::DIALOG_BUTTON_OK;
-  return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
+  if (dialog_type_ == DIALOG_TYPE_QUESTION)
+    return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
+  return ui::DIALOG_BUTTON_OK;
 }
 
 string16 SimpleMessageBoxViews::GetDialogButtonLabel(
     ui::DialogButton button) const {
-  return l10n_util::GetStringUTF16((button == ui::DIALOG_BUTTON_OK) ?
-      IDS_OK : IDS_CLOSE);
+  if (dialog_type_ == DIALOG_TYPE_QUESTION) {
+    return l10n_util::GetStringUTF16((button == ui::DIALOG_BUTTON_OK) ?
+        IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL :

[tfarina, 2012/05/19 14:05:01]

we could have an IDS_YES and IDS_NO.

+        IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL);
+  }
+  return l10n_util::GetStringUTF16(IDS_OK);
 }
 
 bool SimpleMessageBoxViews::Cancel() {
   disposition_ = DISPOSITION_CANCEL;
   return true;
 }
 
 bool SimpleMessageBoxViews::Accept() {
   disposition_ = DISPOSITION_OK;
   return true;
@@ skipping 44 matching lines @@
   SimpleMessageBoxViews::ShowMessageBox(parent, title, message, type);
 }
 
 bool ShowQuestionMessageBox(gfx::NativeWindow parent,
                             const string16& title,
                             const string16& message) {
   return SimpleMessageBoxViews::ShowQuestionMessageBox(parent, title, message);
 }
 
 }  // namespace browser