Fix 8200: Pressing Esc should cancel dialogs, not commit....

chrome/views/dialog_client_view.cc

 // Copyright (c) 2006-2008 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 <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 
 #include "chrome/views/dialog_client_view.h"
 
@@ skipping 49 matching lines @@
         AreAcceleratorsEnabled(type_)) {
       return false;
     }
     return NativeButton::AcceleratorPressed(accelerator);
   }
 
  private:
   Window* owner_;
   const DialogDelegate::DialogButton type_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(DialogButton);
+  DISALLOW_COPY_AND_ASSIGN(DialogButton);
 };
 
 }  // namespace
 
 // static
 ChromeFont DialogClientView::dialog_button_font_;
 static const int kDialogMinButtonWidth = 75;
 static const int kDialogButtonLabelSpacing = 16;
 static const int kDialogButtonContentSpacing = 5;
 
@@ skipping 26 matching lines @@
     if (label.empty())
       label = l10n_util::GetString(IDS_OK);
     bool is_default_button =
         (dd->GetDefaultDialogButton() & DialogDelegate::DIALOGBUTTON_OK) != 0;
     ok_button_ = new DialogButton(window(), DialogDelegate::DIALOGBUTTON_OK,
                                   label, is_default_button);
     ok_button_->SetListener(this);
     ok_button_->SetGroup(kButtonGroup);
     if (is_default_button)
       default_button_ = ok_button_;
-    if (!cancel_button_)
+    if (!(buttons & DialogDelegate::DIALOGBUTTON_CANCEL))
       ok_button_->AddAccelerator(Accelerator(VK_ESCAPE, false, false, false));
     AddChildView(ok_button_);
   }
   if (buttons & DialogDelegate::DIALOGBUTTON_CANCEL && !cancel_button_) {
     std::wstring label =
         dd->GetDialogButtonLabel(DialogDelegate::DIALOGBUTTON_CANCEL);
     if (label.empty()) {
       if (buttons & DialogDelegate::DIALOGBUTTON_OK) {
         label = l10n_util::GetString(IDS_CANCEL);
       } else {
@@ skipping 138 matching lines @@
     // Can only add and update the dialog buttons _after_ they are added to the
     // view hierarchy since they are native controls and require the
     // Container's HWND.
     ShowDialogButtons();
     ClientView::ViewHierarchyChanged(is_add, parent, child);
 
     FocusManager* focus_manager = GetFocusManager();
     // Listen for focus change events so we can update the default button.
     DCHECK(focus_manager);  // bug #1291225: crash reports seem to indicate it
                             // can be NULL.
-    if (focus_manager)   
+    if (focus_manager)
       focus_manager->AddFocusChangeListener(this);
 
     // The "extra view" must be created and installed after the contents view
     // has been inserted into the view hierarchy.
     CreateExtraView();
     UpdateDialogButtons();
     Layout();
   }
 }
 
@@ skipping 139 matching lines @@
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     dialog_button_font_ = rb.GetFont(ResourceBundle::BaseFont);
     initialized = true;
   }
 }
 
 }  // namespace views