Commit 8d960d87 authored by tapted@chromium.org's avatar tapted@chromium.org

MacViews: Get widget_interactive_uitest compiling on Mac

This is done by refactoring some tests to observe focus changes in a
cross-platform manner, and by converting some custom-crafted events to
use the cross-platform event generator.

For now, the code that is only enabled on Windows is unchanged. This
still has aura dependencies, but I hope to enable some of these tests on
Mac in future.

BUG=399191

Review URL: https://codereview.chromium.org/444583002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287944 0039d316-1c4b-4281-b951-d872f2087c98
parent e80904a7
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#include "ui/views/accessible_pane_view.h" #include "ui/views/accessible_pane_view.h"
#include "ui/views/controls/button/label_button.h" #include "ui/views/controls/button/label_button.h"
#include "ui/views/focus/focus_manager_factory.h" #include "ui/views/focus/focus_manager_factory.h"
#include "ui/views/focus/focus_manager_test.h"
#include "ui/views/focus/widget_focus_manager.h" #include "ui/views/focus/widget_focus_manager.h"
#include "ui/views/test/focus_manager_test.h"
#include "ui/views/widget/widget.h" #include "ui/views/widget/widget.h"
namespace views { namespace views {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "ui/views/controls/scroll_view.h" #include "ui/views/controls/scroll_view.h"
#include "ui/views/controls/tabbed_pane/tabbed_pane.h" #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
#include "ui/views/controls/textfield/textfield.h" #include "ui/views/controls/textfield/textfield.h"
#include "ui/views/focus/focus_manager_test.h" #include "ui/views/test/focus_manager_test.h"
#include "ui/views/widget/root_view.h" #include "ui/views/widget/root_view.h"
#include "ui/views/widget/widget.h" #include "ui/views/widget/widget.h"
......
// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "ui/views/focus/focus_manager_test.h" #include "ui/views/test/focus_manager_test.h"
#include <algorithm> #include <algorithm>
......
// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef UI_VIEWS_FOCUS_FOCUS_MANAGER_TEST_H_ #ifndef UI_VIEWS_TEST_FOCUS_MANAGER_TEST_H_
#define UI_VIEWS_FOCUS_FOCUS_MANAGER_TEST_H_ #define UI_VIEWS_TEST_FOCUS_MANAGER_TEST_H_
#include "ui/views/focus/focus_manager.h" #include "ui/views/focus/focus_manager.h"
#include "ui/views/focus/widget_focus_manager.h" #include "ui/views/focus/widget_focus_manager.h"
...@@ -103,4 +103,4 @@ class TestWidgetFocusChangeListener : public WidgetFocusChangeListener { ...@@ -103,4 +103,4 @@ class TestWidgetFocusChangeListener : public WidgetFocusChangeListener {
} // namespace views } // namespace views
#endif // UI_VIEWS_FOCUS_FOCUS_MANAGER_TEST_H_ #endif // UI_VIEWS_TEST_FOCUS_MANAGER_TEST_H_
...@@ -449,6 +449,8 @@ ...@@ -449,6 +449,8 @@
'test/desktop_test_views_delegate_aura.cc', 'test/desktop_test_views_delegate_aura.cc',
'test/desktop_test_views_delegate_mac.mm', 'test/desktop_test_views_delegate_mac.mm',
'test/event_generator_delegate_mac.mm', 'test/event_generator_delegate_mac.mm',
'test/focus_manager_test.h',
'test/focus_manager_test.cc',
'test/menu_runner_test_api.cc', 'test/menu_runner_test_api.cc',
'test/menu_runner_test_api.h', 'test/menu_runner_test_api.h',
'test/slider_test_api.cc', 'test/slider_test_api.cc',
...@@ -518,8 +520,6 @@ ...@@ -518,8 +520,6 @@
'controls/textfield/textfield_unittest.cc', 'controls/textfield/textfield_unittest.cc',
'controls/textfield/textfield_model_unittest.cc', 'controls/textfield/textfield_model_unittest.cc',
'controls/tree/tree_view_unittest.cc', 'controls/tree/tree_view_unittest.cc',
'focus/focus_manager_test.h',
'focus/focus_manager_test.cc',
'focus/focus_manager_unittest.cc', 'focus/focus_manager_unittest.cc',
'focus/focus_traversal_unittest.cc', 'focus/focus_traversal_unittest.cc',
'ime/input_method_bridge_unittest.cc', 'ime/input_method_bridge_unittest.cc',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment