| 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 715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 726 | 726 |
| 727 void Step5() { | 727 void Step5() { |
| 728 GURL url = model_->bookmark_bar_node()->GetChild(0)->GetChild(1)->url(); | 728 GURL url = model_->bookmark_bar_node()->GetChild(0)->GetChild(1)->url(); |
| 729 EXPECT_EQ(url_dragging_, url); | 729 EXPECT_EQ(url_dragging_, url); |
| 730 Done(); | 730 Done(); |
| 731 } | 731 } |
| 732 | 732 |
| 733 GURL url_dragging_; | 733 GURL url_dragging_; |
| 734 }; | 734 }; |
| 735 | 735 |
| 736 #if !defined(OS_WIN) // flaky http://crbug.com/400578 |
| 736 VIEW_TEST(BookmarkBarViewTest5, MAYBE(DND)) | 737 VIEW_TEST(BookmarkBarViewTest5, MAYBE(DND)) |
| 738 #endif |
| 737 | 739 |
| 738 // Tests holding mouse down on overflow button, dragging such that menu pops up | 740 // Tests holding mouse down on overflow button, dragging such that menu pops up |
| 739 // then selecting an item. | 741 // then selecting an item. |
| 740 class BookmarkBarViewTest6 : public BookmarkBarViewEventTestBase { | 742 class BookmarkBarViewTest6 : public BookmarkBarViewEventTestBase { |
| 741 protected: | 743 protected: |
| 742 virtual void DoTestOnMessageLoop() OVERRIDE { | 744 virtual void DoTestOnMessageLoop() OVERRIDE { |
| 743 // Press the mouse button on the overflow button. Don't release it though. | 745 // Press the mouse button on the overflow button. Don't release it though. |
| 744 views::LabelButton* button = bb_view_->overflow_button(); | 746 views::LabelButton* button = bb_view_->overflow_button(); |
| 745 ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT, | 747 ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT, |
| 746 ui_controls::DOWN, CreateEventTask(this, &BookmarkBarViewTest6::Step2)); | 748 ui_controls::DOWN, CreateEventTask(this, &BookmarkBarViewTest6::Step2)); |
| (...skipping 1246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1993 EXPECT_TRUE(bb_view_->GetContextMenu() == NULL); | 1995 EXPECT_TRUE(bb_view_->GetContextMenu() == NULL); |
| 1994 EXPECT_TRUE(bb_view_->GetMenu() == NULL); | 1996 EXPECT_TRUE(bb_view_->GetMenu() == NULL); |
| 1995 | 1997 |
| 1996 Done(); | 1998 Done(); |
| 1997 } | 1999 } |
| 1998 | 2000 |
| 1999 BookmarkContextMenuNotificationObserver observer_; | 2001 BookmarkContextMenuNotificationObserver observer_; |
| 2000 }; | 2002 }; |
| 2001 | 2003 |
| 2002 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder) | 2004 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder) |
| OLD | NEW |