Makes tree commit edits when focus is lost rather than

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 179 matching lines @@
 
   RemoveAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
   RemoveAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
 }
 
 void TreeView::CommitEdit() {
   if (!editing_)
     return;
 
   DCHECK(selected_node_);
+  const bool editor_has_focus = editor_->HasFocus();
   model_->SetTitle(GetSelectedNode(), editor_->text());
   CancelEdit();
-  RequestFocus();
+  if (editor_has_focus)
+    RequestFocus();
 }
 
 TreeModelNode* TreeView::GetEditingNode() {
   return editing_ ? selected_node_->model_node() : NULL;
 }
 
 void TreeView::SetSelectedNode(TreeModelNode* model_node) {
   if (editing_ || model_node != selected_node_)
     CancelEdit();
   if (model_node && model_->GetParent(model_node))
@@ skipping 237 matching lines @@
     case ui::VKEY_ESCAPE:
       CancelEdit();
       RequestFocus();
       return true;
 
     default:
       return false;
   }
 }
 
-void TreeView::OnWillChangeFocus(View* focused_before,
-                                 View* focused_now) {
+void TreeView::OnWillChangeFocus(View* focused_before, View* focused_now) {
 }
 
-void TreeView::OnDidChangeFocus(View* focused_before,
-                                View* focused_now) {
-  CancelEdit();
+void TreeView::OnDidChangeFocus(View* focused_before, View* focused_now) {
+  CommitEdit();
 }
 
 gfx::Point TreeView::GetKeyboardContextMenuLocation() {
   int y = height() / 2;
   if (selected_node_) {
     gfx::Rect node_bounds(GetBoundsForNode(selected_node_));
     gfx::Rect vis_bounds(GetVisibleBounds());
     if (node_bounds.y() >= vis_bounds.y() &&
         node_bounds.y() < vis_bounds.bottom()) {
       y = node_bounds.y();
@@ skipping 492 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