| 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 1733 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1744 | 1744 |
| 1745 TestViewForMenuExit* test_view_; | 1745 TestViewForMenuExit* test_view_; |
| 1746 }; | 1746 }; |
| 1747 | 1747 |
| 1748 #if defined(OS_WIN) && !defined(USE_AURA) | 1748 #if defined(OS_WIN) && !defined(USE_AURA) |
| 1749 #define MAYBE_ContextMenuExitTest DISABLED_ContextMenuExitTest | 1749 #define MAYBE_ContextMenuExitTest DISABLED_ContextMenuExitTest |
| 1750 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) | 1750 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 1751 // TODO(erg): linux_aura bringup: http://crbug.com/163931 | 1751 // TODO(erg): linux_aura bringup: http://crbug.com/163931 |
| 1752 #define MAYBE_ContextMenuExitTest DISABLED_ContextMenuExitTest | 1752 #define MAYBE_ContextMenuExitTest DISABLED_ContextMenuExitTest |
| 1753 #else | 1753 #else |
| 1754 #define MAYBE_ContextMenuExitTest ContextMenuExitTest | 1754 // TODO(ananta): Investigate and fix: http://crbug.com/325540 |
| 1755 #define MAYBE_ContextMenuExitTest DISABLED_ContextMenuExitTest |
| 1755 #endif | 1756 #endif |
| 1756 | 1757 |
| 1757 VIEW_TEST(BookmarkBarViewTest20, MAYBE_ContextMenuExitTest) | 1758 VIEW_TEST(BookmarkBarViewTest20, MAYBE_ContextMenuExitTest) |
| 1758 | 1759 |
| 1759 // Tests context menu by way of opening a context menu for a empty folder menu. | 1760 // Tests context menu by way of opening a context menu for a empty folder menu. |
| 1760 // The opened context menu should behave as it is from the folder button. | 1761 // The opened context menu should behave as it is from the folder button. |
| 1761 class BookmarkBarViewTest21 : public BookmarkBarViewEventTestBase { | 1762 class BookmarkBarViewTest21 : public BookmarkBarViewEventTestBase { |
| 1762 public: | 1763 public: |
| 1763 BookmarkBarViewTest21() | 1764 BookmarkBarViewTest21() |
| 1764 : observer_(CreateEventTask(this, &BookmarkBarViewTest21::Step3)) { | 1765 : observer_(CreateEventTask(this, &BookmarkBarViewTest21::Step3)) { |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1821 EXPECT_TRUE(bb_view_->GetContextMenu() == NULL); | 1822 EXPECT_TRUE(bb_view_->GetContextMenu() == NULL); |
| 1822 EXPECT_TRUE(bb_view_->GetMenu() == NULL); | 1823 EXPECT_TRUE(bb_view_->GetMenu() == NULL); |
| 1823 | 1824 |
| 1824 Done(); | 1825 Done(); |
| 1825 } | 1826 } |
| 1826 | 1827 |
| 1827 ContextMenuNotificationObserver observer_; | 1828 ContextMenuNotificationObserver observer_; |
| 1828 }; | 1829 }; |
| 1829 | 1830 |
| 1830 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder) | 1831 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder) |
| OLD | NEW |