summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-05 23:31:39 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-05 23:31:39 +0000
commit12338015077b13e550ce7c4201f8faf8cd858ca5 (patch)
tree1417460d9042577a0560d90d31fe3d2684af5700 /chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
parent5b1de14a065c0bc793fbdffdf5004a8181aae1ef (diff)
downloadchromium_src-12338015077b13e550ce7c4201f8faf8cd858ca5.zip
chromium_src-12338015077b13e550ce7c4201f8faf8cd858ca5.tar.gz
chromium_src-12338015077b13e550ce7c4201f8faf8cd858ca5.tar.bz2
Reverting the NativeViewHostWin focus refactoring.
It seems the added subclassing is causing crashers in the field. BUG=23861 TEST=None TBR=beng Review URL: http://codereview.chromium.org/259052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28061 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
index 2798fc2..6dfb45d 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
@@ -505,10 +505,6 @@ gfx::NativeView AutocompleteEditViewGtk::GetNativeView() const {
return alignment_.get();
}
-gfx::NativeView AutocompleteEditViewGtk::GetFocusNativeView() const {
- return text_view_;
-}
-
void AutocompleteEditViewGtk::Observe(NotificationType type,
const NotificationSource& source,
const NotificationDetails& details) {
@@ -760,6 +756,7 @@ gboolean AutocompleteEditViewGtk::HandleViewFocusIn() {
GdkModifierType modifiers;
gdk_window_get_pointer(text_view_->window, NULL, NULL, &modifiers);
model_->OnSetFocus((modifiers & GDK_CONTROL_MASK) != 0);
+ controller_->OnSetFocus();
// TODO(deanm): Some keyword hit business, etc here.
return FALSE; // Continue propagation.