Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(646)

Unified Diff: chrome/browser/views/find_bar_win.cc

Issue 115832: Fix 12729: Find box doesn't unregister Esc accelerator.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/views/find_bar_win_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/find_bar_win.cc
===================================================================
--- chrome/browser/views/find_bar_win.cc (revision 16885)
+++ chrome/browser/views/find_bar_win.cc (working copy)
@@ -35,7 +35,7 @@
#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);
@@ -55,7 +55,9 @@
#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);
@@ -439,7 +441,7 @@
!::IsWindow(host_->GetNativeView())) {
#else
false) {
- // TODO: figure out linux side.
+ // TODO(sky): figure out linux side.
#endif
*position = gfx::Point();
*fully_visible = false;
@@ -623,7 +625,7 @@
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();
« no previous file with comments | « no previous file | chrome/browser/views/find_bar_win_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698