summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/dropdown_bar_host.cc
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 02:10:42 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 02:10:42 +0000
commitc868a5251e1251a5b555c181ffb9e6804dc3e84f (patch)
tree75f4e77c78a2a7c156b62326bbf910f93c98300c /chrome/browser/views/dropdown_bar_host.cc
parent442d293cc0b415c6f20231ea2a577b316162c5be (diff)
downloadchromium_src-c868a5251e1251a5b555c181ffb9e6804dc3e84f.zip
chromium_src-c868a5251e1251a5b555c181ffb9e6804dc3e84f.tar.gz
chromium_src-c868a5251e1251a5b555c181ffb9e6804dc3e84f.tar.bz2
Wire up Ctrl+Enter for Find on ToolkitViews to match GTK.
BUG=38366 TEST=Find a link, press Ctrl+Enter. Find box should close chrome should navigate the link. Review URL: http://codereview.chromium.org/1562006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/dropdown_bar_host.cc')
-rw-r--r--chrome/browser/views/dropdown_bar_host.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/views/dropdown_bar_host.cc b/chrome/browser/views/dropdown_bar_host.cc
index 539d6cc..963a81e 100644
--- a/chrome/browser/views/dropdown_bar_host.cc
+++ b/chrome/browser/views/dropdown_bar_host.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -133,11 +133,11 @@ void DropdownBarHost::FocusWillChange(views::View* focused_before,
if (!our_view_before && our_view_now) {
// We are gaining focus from outside the dropdown widget so we must register
// a handler for Escape.
- RegisterEscAccelerator();
+ RegisterAccelerators();
} else if (our_view_before && !our_view_now) {
// We are losing focus to something outside our widget so we restore the
// original handler for Escape.
- UnregisterEscAccelerator();
+ UnregisterAccelerators();
}
}
@@ -302,14 +302,14 @@ void DropdownBarHost::UpdateWindowEdges(const gfx::Rect& new_pos) {
host()->SetShape(region.release());
}
-void DropdownBarHost::RegisterEscAccelerator() {
+void DropdownBarHost::RegisterAccelerators() {
DCHECK(!esc_accel_target_registered_);
views::Accelerator escape(base::VKEY_ESCAPE, false, false, false);
focus_manager_->RegisterAccelerator(escape, this);
esc_accel_target_registered_ = true;
}
-void DropdownBarHost::UnregisterEscAccelerator() {
+void DropdownBarHost::UnregisterAccelerators() {
DCHECK(esc_accel_target_registered_);
views::Accelerator escape(base::VKEY_ESCAPE, false, false, false);
focus_manager_->UnregisterAccelerator(escape, this);