diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-23 21:02:36 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-23 21:02:36 +0000 |
| commit | cc8c922bb567001af16964d6751eedddfb21c7ff (patch) | |
| tree | b9b7e2db62e673dc3ee2bb0776e5f03802da53c8 | |
| parent | 89fd564fa5012296bbd41164865934f3b902b6fd (diff) | |
| download | chromium_src-cc8c922bb567001af16964d6751eedddfb21c7ff.zip chromium_src-cc8c922bb567001af16964d6751eedddfb21c7ff.tar.gz chromium_src-cc8c922bb567001af16964d6751eedddfb21c7ff.tar.bz2 | |
Disable Tab2OutOfTabStrip on TOOLKIT_VIEWS and ScrollButtonScrolls on
both OS_CHROMEOS and TOOLKIT_VIEWS
BUG=60444
Review URL: http://codereview.chromium.org/3972007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63658 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view_test.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/tab_dragging_test.cc | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc index 06e1242..05f3a42 100644 --- a/chrome/browser/views/bookmark_bar_view_test.cc +++ b/chrome/browser/views/bookmark_bar_view_test.cc @@ -53,6 +53,13 @@ #endif +#if defined(OS_CHROMEOS) || defined(TOOLKIT_VIEWS) +// See bug http://crbug.com/60444 for details. +define MAYBE_ScrollButtonScrolls DISABLED_ScrollButtonScrolls +#else +define MAYBE_ScrollButtonScrolls ScrollButtonScrolls +#endif + namespace { class ViewsDelegateImpl : public views::ViewsDelegate { @@ -849,7 +856,7 @@ class BookmarkBarViewTest9 : public BookmarkBarViewEventTestBase { views::MenuItemView* first_menu_; }; -VIEW_TEST(BookmarkBarViewTest9, ScrollButtonScrolls) +VIEW_TEST(BookmarkBarViewTest9, MAYBE_ScrollButtonScrolls) // Tests up/down/left/enter key messages. class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase { diff --git a/chrome/browser/views/tabs/tab_dragging_test.cc b/chrome/browser/views/tabs/tab_dragging_test.cc index 91286ec..ff5a699 100644 --- a/chrome/browser/views/tabs/tab_dragging_test.cc +++ b/chrome/browser/views/tabs/tab_dragging_test.cc @@ -18,7 +18,7 @@ #include "net/base/net_util.h" #include "views/event.h" -#if defined(OS_CHROMEOS) +#if defined(OS_CHROMEOS) || defined(TOOLKIT_VIEWS) // This test doesn't make sense on chromeos as chromeos doesn't allow dragging // tabs out. #define MAYBE_Tab2OutOfTabStrip DISABLED_Tab2OutOfTabStrip |