summaryrefslogtreecommitdiffstats
path: root/views/focus
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-29 18:17:28 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-29 18:17:28 +0000
commit595513ffea29bc07d8b3a087fffe9f84a60ecc6f (patch)
tree124d5c04ed50f9b9717c6ba6173e27d92e7baeb1 /views/focus
parent9b6fee14acedde5c6b627d5f9b691776fc8d868c (diff)
downloadchromium_src-595513ffea29bc07d8b3a087fffe9f84a60ecc6f.zip
chromium_src-595513ffea29bc07d8b3a087fffe9f84a60ecc6f.tar.gz
chromium_src-595513ffea29bc07d8b3a087fffe9f84a60ecc6f.tar.bz2
Reverting 27504, it breaks the interactive ui tests on Windows.
TBR=oshima Review URL: http://codereview.chromium.org/243034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus')
-rw-r--r--views/focus/focus_manager_gtk.cc11
1 files changed, 1 insertions, 10 deletions
diff --git a/views/focus/focus_manager_gtk.cc b/views/focus/focus_manager_gtk.cc
index 3038d93..93b9cb7 100644
--- a/views/focus/focus_manager_gtk.cc
+++ b/views/focus/focus_manager_gtk.cc
@@ -8,20 +8,11 @@
#include "base/logging.h"
#include "views/widget/widget_gtk.h"
-#include "views/window/window_gtk.h"
namespace views {
void FocusManager::ClearNativeFocus() {
- GtkWidget* gtk_widget = widget_->GetNativeView();
- if (!gtk_widget) {
- NOTREACHED();
- return;
- }
-
- // Since only top-level WidgetGtk have a focus manager, the native view is
- // expected to be a GtkWindow.
- gtk_window_set_focus(GTK_WINDOW(gtk_widget), NULL);
+ gtk_widget_grab_focus(widget_->GetNativeView());
}
void FocusManager::FocusNativeView(gfx::NativeView native_view) {