diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-29 19:49:44 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-29 19:49:44 +0000 |
| commit | 4baf67f8c9ee8cf5ce442b845338438a4b87fcac (patch) | |
| tree | 270da7b7aa362d3045b071b890f33ce32e7765f4 /ash/wm/window_modality_controller_unittest.cc | |
| parent | b2360b158e12e9a3df97784360f1c97831ece796 (diff) | |
| download | chromium_src-4baf67f8c9ee8cf5ce442b845338438a4b87fcac.zip chromium_src-4baf67f8c9ee8cf5ce442b845338438a4b87fcac.tar.gz chromium_src-4baf67f8c9ee8cf5ce442b845338438a4b87fcac.tar.bz2 | |
MacViews: Minimal to get views_unittests to compile.
- ui/views/test/child_modal_window.{h,cc} is moved from
views_test_support to ash_test_support
- test_views_delegate.cc is moved to test_views_delegate_aura.cc and a
mac version added
- the set of unittest.cc files that need refactoring for Aura are left
off for mac to be enabled in a followup - http://crbug.com/378134
- a few other small fixes
BUG=366007
Review URL: https://codereview.chromium.org/303473010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273554 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_modality_controller_unittest.cc')
| -rw-r--r-- | ash/wm/window_modality_controller_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/wm/window_modality_controller_unittest.cc b/ash/wm/window_modality_controller_unittest.cc index ce70432..1519d27 100644 --- a/ash/wm/window_modality_controller_unittest.cc +++ b/ash/wm/window_modality_controller_unittest.cc @@ -6,6 +6,7 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/test/child_modal_window.h" #include "ash/wm/window_util.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/test/event_generator.h" @@ -15,7 +16,6 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_types.h" #include "ui/views/test/capture_tracking_view.h" -#include "ui/views/test/child_modal_window.h" #include "ui/views/widget/widget.h" #include "ui/wm/core/window_util.h" @@ -392,8 +392,8 @@ TEST_F(WindowModalityControllerTest, TouchEvent) { // |child| window. // - Focus should follow the active window. TEST_F(WindowModalityControllerTest, ChildModal) { - views::test::ChildModalParent* delegate = - new views::test::ChildModalParent(CurrentContext()); + test::ChildModalParent* delegate = + new test::ChildModalParent(CurrentContext()); views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds( delegate, CurrentContext(), gfx::Rect(0, 0, 400, 400)); widget->Show(); @@ -452,8 +452,8 @@ TEST_F(WindowModalityControllerTest, ChildModal) { // Same as |ChildModal| test, but using |EventGenerator| rather than bypassing // it by calling |ActivateWindow|. TEST_F(WindowModalityControllerTest, ChildModalEventGenerator) { - views::test::ChildModalParent* delegate = - new views::test::ChildModalParent(CurrentContext()); + test::ChildModalParent* delegate = + new test::ChildModalParent(CurrentContext()); views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds( delegate, CurrentContext(), gfx::Rect(0, 0, 400, 400)); widget->Show(); |