diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 19:41:10 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 19:41:10 +0000 |
| commit | 248c85dab8fa86d39e07bbcaf5c7f8d82fba6aad (patch) | |
| tree | b6f4515bee9507bb797339463c20fc296a857a3f | |
| parent | 3bbb0f09adfbb3fd56fabfd9fde0767719d7c49b (diff) | |
| download | chromium_src-248c85dab8fa86d39e07bbcaf5c7f8d82fba6aad.zip chromium_src-248c85dab8fa86d39e07bbcaf5c7f8d82fba6aad.tar.gz chromium_src-248c85dab8fa86d39e07bbcaf5c7f8d82fba6aad.tar.bz2 | |
Tweaks #ifdefs in ViewsEventTestBase. We shouldn't change the stacking
client for chromeos builds.
BUG=165198
TEST=none
R=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11488020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172931 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc | 2 | ||||
| -rw-r--r-- | chrome/test/base/view_event_test_base.cc | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index ae05cdc..2d33c75 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -1140,9 +1140,7 @@ class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase { } }; -#if !defined(OS_CHROMEOS) // http://crbug.com/165198 VIEW_TEST(BookmarkBarViewTest12, CloseWithModalDialog) -#endif // Tests clicking on the separator of a context menu (this is for coverage of // bug 17862). diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc index 19216d5..5cd8344 100644 --- a/chrome/test/base/view_event_test_base.cc +++ b/chrome/test/base/view_event_test_base.cc @@ -109,6 +109,11 @@ void ViewEventTestBase::SetUp() { #endif window_ = views::Widget::CreateWindowWithContext(this, context); + +#if defined(USE_AURA) && !defined(OS_CHROMEOS) + stacking_client_.reset(new aura::test::TestStackingClient( + window_->GetNativeWindow()->GetRootWindow())); +#endif } void ViewEventTestBase::TearDown() { |