OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/callback.h" | 6 #include "base/callback.h" |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
(...skipping 1667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1678 | 1678 |
1679 BookmarkContextMenuNotificationObserver observer_; | 1679 BookmarkContextMenuNotificationObserver observer_; |
1680 }; | 1680 }; |
1681 | 1681 |
1682 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) | 1682 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) |
1683 // TODO(erg): linux_aura bringup: http://crbug.com/163931 | 1683 // TODO(erg): linux_aura bringup: http://crbug.com/163931 |
1684 #define MAYBE_ContextMenus3 DISABLED_ContextMenus3 | 1684 #define MAYBE_ContextMenus3 DISABLED_ContextMenus3 |
1685 #elif defined(USE_OZONE) | 1685 #elif defined(USE_OZONE) |
1686 // ozone bringup - http://crbug.com/401304 | 1686 // ozone bringup - http://crbug.com/401304 |
1687 #define MAYBE_ContextMenus3 DISABLED_ContextMenus3 | 1687 #define MAYBE_ContextMenus3 DISABLED_ContextMenus3 |
| 1688 #elif defined(OS_WIN) // http://crbug.com/128961 |
| 1689 #define MAYBE_ContextMenus3 DISABLED_ContextMenus3 |
1688 #else | 1690 #else |
1689 #define MAYBE_ContextMenus3 ContextMenus3 | 1691 #define MAYBE_ContextMenus3 ContextMenus3 |
1690 #endif | 1692 #endif |
1691 | 1693 |
1692 VIEW_TEST(BookmarkBarViewTest17, MAYBE_ContextMenus3) | 1694 VIEW_TEST(BookmarkBarViewTest17, MAYBE_ContextMenus3) |
1693 | 1695 |
1694 // Verifies sibling menus works. Clicks on the 'other bookmarks' folder, then | 1696 // Verifies sibling menus works. Clicks on the 'other bookmarks' folder, then |
1695 // moves the mouse over the first item on the bookmark bar and makes sure the | 1697 // moves the mouse over the first item on the bookmark bar and makes sure the |
1696 // menu appears. | 1698 // menu appears. |
1697 class BookmarkBarViewTest18 : public BookmarkBarViewEventTestBase { | 1699 class BookmarkBarViewTest18 : public BookmarkBarViewEventTestBase { |
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1995 EXPECT_TRUE(bb_view_->GetContextMenu() == NULL); | 1997 EXPECT_TRUE(bb_view_->GetContextMenu() == NULL); |
1996 EXPECT_TRUE(bb_view_->GetMenu() == NULL); | 1998 EXPECT_TRUE(bb_view_->GetMenu() == NULL); |
1997 | 1999 |
1998 Done(); | 2000 Done(); |
1999 } | 2001 } |
2000 | 2002 |
2001 BookmarkContextMenuNotificationObserver observer_; | 2003 BookmarkContextMenuNotificationObserver observer_; |
2002 }; | 2004 }; |
2003 | 2005 |
2004 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder) | 2006 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder) |
OLD | NEW |