Handle dialog acclerators explicitly; nix default button switching.

ui/views/controls/tree/tree_view.cc

Index: ui/views/controls/tree/tree_view.cc
diff --git a/ui/views/controls/tree/tree_view.cc b/ui/views/controls/tree/tree_view.cc
index 34d65617cf12ae1ab43db3f2820910b052ec1e99..25c09b5adc569d5d8ac0767c8860dacb45748140 100644
--- a/ui/views/controls/tree/tree_view.cc
+++ b/ui/views/controls/tree/tree_view.cc
@@ -353,14 +353,15 @@ gfx::Size TreeView::GetPreferredSize() {
 }
 
 bool TreeView::AcceleratorPressed(const ui::Accelerator& accelerator) {
-  if (accelerator.key_code() == ui::VKEY_RETURN) {
+  if (accelerator.key_code() == ui::VKEY_RETURN && editing_) {
     CommitEdit();
-  } else {
-    DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code());
+    return true;
+  } else if (accelerator.key_code() == ui::VKEY_ESCAPE) {
     CancelEdit();
     RequestFocus();
+    return true;
   }
-  return true;
+  return false;
 }
 
 bool TreeView::OnMousePressed(const ui::MouseEvent& event) {