diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-30 23:49:39 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-30 23:49:39 +0000 |
| commit | 3be6c69d07727f429c108a0c649bbbfb20403a47 (patch) | |
| tree | 48f341091c9ba0c58ec737c6636d749b6eb8ff2b | |
| parent | f9a45b0b8d83d75bb5a9aa22b13ba06a2f7be08c (diff) | |
| download | chromium_src-3be6c69d07727f429c108a0c649bbbfb20403a47.zip chromium_src-3be6c69d07727f429c108a0c649bbbfb20403a47.tar.gz chromium_src-3be6c69d07727f429c108a0c649bbbfb20403a47.tar.bz2 | |
Fix to pure view test on touch.
TBR=ben@chromium.org
BUG=none
TEST=AccessibilityEventRouterViewsTest.TestFocusNotification
Review URL: http://codereview.chromium.org/7278010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91233 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/views/accessibility_event_router_views_unittest.cc | 2 | ||||
| -rw-r--r-- | views/controls/native/native_view_host_gtk.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc index ad0c746..e984655 100644 --- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc +++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc @@ -130,7 +130,6 @@ class AccessibilityEventRouterViewsTest AccessibilityWindowDelegate* window_delegate_; }; -#if !defined(TOUCH_UI) TEST_F(AccessibilityEventRouterViewsTest, TestFocusNotification) { const char kButton1ASCII[] = "Button1"; const char kButton2ASCII[] = "Button2"; @@ -191,6 +190,5 @@ TEST_F(AccessibilityEventRouterViewsTest, TestFocusNotification) { EXPECT_EQ(3, focus_event_count_); EXPECT_EQ(kButton1ASCII, last_control_name_); } -#endif #endif // defined(TOOLKIT_VIEWS) diff --git a/views/controls/native/native_view_host_gtk.cc b/views/controls/native/native_view_host_gtk.cc index fbe4d3e..50255f9 100644 --- a/views/controls/native/native_view_host_gtk.cc +++ b/views/controls/native/native_view_host_gtk.cc @@ -11,6 +11,7 @@ #include "views/controls/native/native_view_host.h" #include "views/controls/native/native_view_host_views.h" #include "views/focus/focus_manager.h" +#include "views/views_delegate.h" #include "views/widget/gtk_views_fixed.h" #include "views/widget/native_widget_gtk.h" #include "views/widget/widget.h" @@ -377,7 +378,8 @@ gboolean NativeViewHostGtk::CallFocusIn(GtkWidget* widget, // static NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper( NativeViewHost* host) { - if (Widget::IsPureViews()) + if (Widget::IsPureViews() && + views::ViewsDelegate::views_delegate->GetDefaultParentView()) return new NativeViewHostViews(host); return new NativeViewHostGtk(host); } |