Handle dialog acclerators explicitly; nix default button switching.

ui/views/controls/tree/tree_view.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 "ui/views/controls/tree/tree_view.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
@@ skipping 335 matching lines @@
   }
   SetBounds(x(), y(), width, height);
   LayoutEditor();
 }
 
 gfx::Size TreeView::GetPreferredSize() {
   return preferred_size_;
 }
 
 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) {
   return OnClickOrTap(event);
 }
 
 ui::TextInputClient* TreeView::GetTextInputClient() {
   if (!selector_)
     selector_.reset(new TreeViewSelector(this));
   return selector_.get();
@@ skipping 624 matching lines @@
   if (!is_expanded_)
     return max_width;
   for (int i = 0; i < child_count(); ++i) {
     max_width = std::max(max_width,
                          GetChild(i)->GetMaxWidth(indent, depth + 1));
   }
   return max_width;
 }
 
 }  // namespace views