Simplifying renderer focus management

chrome/renderer/render_view.cc

 // Copyright (c) 2009 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/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 2133 matching lines @@
       // the frame, otherwise it will report 'no match' if the focused frame has
       // reported matches, but no frames after the focused_frame contain a
       // match for the search word(s).
       if (multi_frame && search_frame == focused_frame) {
         result = search_frame->Find(
             request_id, search_text, options, true,  // Force wrapping.
             &selection_rect);
       }
     }
 
-    // TODO(jcampan): http://b/issue?id=1157486 Remove StoreForFocus call once
-    //                we have the fix for 792423.
-    search_frame->GetView()->StoreFocusForFrame(search_frame);
     webview()->SetFocusedFrame(search_frame);
   } while (!result && search_frame != focused_frame);
 
-  // Make sure we don't leave any frame focused or the focus won't be restored
-  // properly in WebViewImpl::SetFocus().  Note that we are talking here about
-  // focused on the SelectionController, not FocusController.
-  // webview()->GetFocusedFrame() will still return the last focused frame (as
-  // it queries the FocusController).
-  // TODO(jcampan): http://b/issue?id=1157486 Remove next line once we have the
-  //                fix for 792423.
-  webview()->SetFocusedFrame(NULL);
-
   if (options.findNext) {
     // Force the main_frame to report the actual count.
     main_frame->IncreaseMatchCount(0, request_id);
   } else {
     // If nothing is found, set result to "0 of 0", otherwise, set it to
     // "-1 of 1" to indicate that we found at least one item, but we don't know
     // yet what is active.
     int ordinal = result ? -1 : 0;  // -1 here means, we might know more later.
     int match_count = result ? 1 : 0;  // 1 here means possibly more coming.
 
@@ skipping 791 matching lines @@
     Send(new ViewHostMsg_PasswordFormsSeen(routing_id_, password_forms));
 }
 
 void RenderView::Print(WebFrame* frame, bool script_initiated) {
   DCHECK(frame);
   if (print_helper_.get() == NULL) {
     print_helper_.reset(new PrintWebViewHelper(this));
   }
   print_helper_->Print(frame, script_initiated);
 }