Fix 12729: Find box doesn't unregister Esc accelerator....

chrome/browser/views/find_bar_win.cc

 // Copyright (c) 2006-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/browser/views/find_bar_win.h"
 
 #include "app/slide_animation.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/find_bar_controller.h"
@@ skipping 17 matching lines @@
 // The minimum space between the FindInPage window and the search result.
 static const int kMinFindWndDistanceFromSelection = 5;
 
 // static
 bool FindBarWin::disable_animations_during_testing_ = false;
 
 // Host is the actual widget containing FindBarView.
 #if defined(OS_WIN)
 class FindBarWin::Host : public views::WidgetWin {
  public:
-  Host(FindBarWin* find_bar) : find_bar_(find_bar) {
+  explicit Host(FindBarWin* find_bar) : find_bar_(find_bar) {
     // Don't let WidgetWin manage our lifetime. We want our lifetime to
     // coincide with TabContents.
     set_delete_on_destroy(false);
     set_window_style(WS_CHILD | WS_CLIPCHILDREN);
     set_window_ex_style(WS_EX_TOPMOST);
   }
 
   void OnFinalMessage(HWND window) {
     find_bar_->OnFinalMessage();
   }
 
  private:
   FindBarWin* find_bar_;
 
   DISALLOW_COPY_AND_ASSIGN(Host);
 };
 #else
 class FindBarWin::Host : public views::WidgetGtk {
  public:
-  Host(FindBarWin* find_bar) : WidgetGtk(TYPE_CHILD), find_bar_(find_bar) {
+  explicit Host(FindBarWin* find_bar)
+    : WidgetGtk(TYPE_CHILD),
+      find_bar_(find_bar) {
     // Don't let WidgetWin manage our lifetime. We want our lifetime to
     // coincide with TabContents.
     set_delete_on_destroy(false);
   }
 
   void OnDestroy(GtkWidget* widget) {
     find_bar_->OnFinalMessage();
   }
 
  private:
@@ skipping 363 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // FindBarTesting implementation:
 
 bool FindBarWin::GetFindBarWindowInfo(gfx::Point* position,
                                       bool* fully_visible) {
   if (!find_bar_controller_ ||
 #if defined(OS_WIN)
       !::IsWindow(host_->GetNativeView())) {
 #else
       false) {
-      // TODO: figure out linux side.
+      // TODO(sky): figure out linux side.
 #endif
     *position = gfx::Point();
     *fully_visible = false;
     return false;
   }
 
   gfx::Rect window_rect;
   host_->GetBounds(&window_rect, true);
   *position = window_rect.origin();
   *fully_visible = host_->IsVisible() && !IsAnimating();
@@ skipping 163 matching lines @@
 }
 
 void FindBarWin::UnregisterEscAccelerator() {
 #if defined(OS_WIN)
   // TODO(finnur): Once we fix issue 1307173 we should not remember any old
   // accelerator targets and just Register and Unregister when needed.
   DCHECK(old_accel_target_for_esc_ != NULL);
   views::Accelerator escape(VK_ESCAPE, false, false, false);
   views::AcceleratorTarget* current_target =
       focus_manager_->GetTargetForAccelerator(escape);
-  if (current_target == host_.get())
+  if (current_target == this)
     focus_manager_->RegisterAccelerator(escape, old_accel_target_for_esc_);
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 void FindBarWin::UpdateUIForFindResult(const FindNotificationDetails& result,
                                        const string16& find_text) {
   view_->UpdateForResult(result, find_text);
 
   // We now need to check if the window is obscuring the search results.
   if (!result.selection_rect().IsEmpty())
     MoveWindowIfNecessary(result.selection_rect(), false);
 
   // Once we find a match we no longer want to keep track of what had
   // focus. EndFindSession will then set the focus to the page content.
   if (result.number_of_matches() > 0)
     focus_tracker_.reset(NULL);
 }
 
 void FindBarWin::AudibleAlert() {
 #if defined(OS_WIN)
   MessageBeep(MB_OK);
 #else
   NOTIMPLEMENTED();
 #endif
 }