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 1655 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1666 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); | 1666 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); |
1667 | 1667 |
1668 bb_view_->GetMenu()->GetMenuController()->CancelAll(); | 1668 bb_view_->GetMenu()->GetMenuController()->CancelAll(); |
1669 | 1669 |
1670 Done(); | 1670 Done(); |
1671 } | 1671 } |
1672 | 1672 |
1673 BookmarkContextMenuNotificationObserver observer_; | 1673 BookmarkContextMenuNotificationObserver observer_; |
1674 }; | 1674 }; |
1675 | 1675 |
1676 VIEW_TEST(BookmarkBarViewTest17, ContextMenus3) | 1676 #if defined(OS_WIN) |
| 1677 // Flaky on Win7. crbug/453796 |
| 1678 #define MAYBE_ContextMenus3 DISABLED_ContextMenus3 |
| 1679 #else |
| 1680 #define MAYBE_ContextMenus3 ContextMenus3 |
| 1681 #endif |
| 1682 |
| 1683 VIEW_TEST(BookmarkBarViewTest17, MAYBE_ContextMenus3) |
1677 | 1684 |
1678 // Verifies sibling menus works. Clicks on the 'other bookmarks' folder, then | 1685 // Verifies sibling menus works. Clicks on the 'other bookmarks' folder, then |
1679 // moves the mouse over the first item on the bookmark bar and makes sure the | 1686 // moves the mouse over the first item on the bookmark bar and makes sure the |
1680 // menu appears. | 1687 // menu appears. |
1681 class BookmarkBarViewTest18 : public BookmarkBarViewEventTestBase { | 1688 class BookmarkBarViewTest18 : public BookmarkBarViewEventTestBase { |
1682 protected: | 1689 protected: |
1683 void DoTestOnMessageLoop() override { | 1690 void DoTestOnMessageLoop() override { |
1684 // Move the mouse to the other folder on the bookmark bar and press the | 1691 // Move the mouse to the other folder on the bookmark bar and press the |
1685 // left mouse button. | 1692 // left mouse button. |
1686 views::LabelButton* button = bb_view_->other_bookmarks_button(); | 1693 views::LabelButton* button = bb_view_->other_bookmarks_button(); |
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2045 }; | 2052 }; |
2046 | 2053 |
2047 #if defined(OS_WIN) | 2054 #if defined(OS_WIN) |
2048 // This test times out on Windows. TODO(pkotwicz): Find out why. | 2055 // This test times out on Windows. TODO(pkotwicz): Find out why. |
2049 #define MAYBE_CloseSourceBrowserDuringDrag DISABLED_CloseSourceBrowserDuringDrag | 2056 #define MAYBE_CloseSourceBrowserDuringDrag DISABLED_CloseSourceBrowserDuringDrag |
2050 #else | 2057 #else |
2051 #define MAYBE_CloseSourceBrowserDuringDrag CloseSourceBrowserDuringDrag | 2058 #define MAYBE_CloseSourceBrowserDuringDrag CloseSourceBrowserDuringDrag |
2052 #endif | 2059 #endif |
2053 | 2060 |
2054 VIEW_TEST(BookmarkBarViewTest22, MAYBE_CloseSourceBrowserDuringDrag) | 2061 VIEW_TEST(BookmarkBarViewTest22, MAYBE_CloseSourceBrowserDuringDrag) |
OLD | NEW |