diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 18:22:10 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 18:22:10 +0000 |
| commit | 0c96668965e17a98f29b6862468783e5a04af0d7 (patch) | |
| tree | 0386d0b802abcb6bc0c143648bdbfaaea6cdb154 /views/widget | |
| parent | 134efc37e03e2d8da955f855533fbb5c7c6177f1 (diff) | |
| download | chromium_src-0c96668965e17a98f29b6862468783e5a04af0d7.zip chromium_src-0c96668965e17a98f29b6862468783e5a04af0d7.tar.gz chromium_src-0c96668965e17a98f29b6862468783e5a04af0d7.tar.bz2 | |
Nix GetFocusManagerForNativeView|Window.
Use Widget|View::GetFocusManager instead.
Use Widget::Get[TopLevel]WidgetForNativeView|Window as necessary.
BUG=88718
TEST=none
Review URL: http://codereview.chromium.org/7532015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
| -rw-r--r-- | views/widget/gtk_views_window.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/views/widget/gtk_views_window.cc b/views/widget/gtk_views_window.cc index 7da1490..dbb526a 100644 --- a/views/widget/gtk_views_window.cc +++ b/views/widget/gtk_views_window.cc @@ -1,11 +1,12 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 <gtk/gtk.h> #include "views/events/event.h" -#include "views/widget/gtk_views_window.h" #include "views/focus/focus_manager.h" +#include "views/widget/gtk_views_window.h" +#include "views/widget/widget.h" G_BEGIN_DECLS @@ -13,8 +14,9 @@ G_DEFINE_TYPE(GtkViewsWindow, gtk_views_window, GTK_TYPE_WINDOW) static void gtk_views_window_move_focus(GtkWindow* window, GtkDirectionType dir) { + views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window); views::FocusManager* focus_manager = - views::FocusManager::GetFocusManagerForNativeWindow(window); + widget ? widget->GetFocusManager() : NULL; if (focus_manager) { GdkEvent* key = gtk_get_current_event(); if (key && key->type == GDK_KEY_PRESS) { |