Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc

Issue 10878087: Disabled DNDToDifferentMenu test on linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add bug comment. Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
(...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
766 } 766 }
767 767
768 void Step5() { 768 void Step5() {
769 ASSERT_TRUE(model_->other_node()->GetChild(0)->url() == url_dragging_); 769 ASSERT_TRUE(model_->other_node()->GetChild(0)->url() == url_dragging_);
770 Done(); 770 Done();
771 } 771 }
772 772
773 GURL url_dragging_; 773 GURL url_dragging_;
774 }; 774 };
775 775
776 #if defined(OS_WIN) 776 #if defined(OS_WIN) || defined(OS_LINUX)
777 // See http://crbug.com/128961
777 #define MAYBE_DNDToDifferentMenu DISABLED_DNDToDifferentMenu 778 #define MAYBE_DNDToDifferentMenu DISABLED_DNDToDifferentMenu
778 #else 779 #else
779 #define MAYBE_DNDToDifferentMenu DNDToDifferentMenu 780 #define MAYBE_DNDToDifferentMenu DNDToDifferentMenu
780 #endif 781 #endif
781 VIEW_TEST(BookmarkBarViewTest7, MAYBE_DNDToDifferentMenu) 782 VIEW_TEST(BookmarkBarViewTest7, MAYBE_DNDToDifferentMenu)
782 783
783 // Drags from one menu to next so that original menu closes, then back to 784 // Drags from one menu to next so that original menu closes, then back to
784 // original menu. 785 // original menu.
785 class BookmarkBarViewTest8 : public BookmarkBarViewEventTestBase { 786 class BookmarkBarViewTest8 : public BookmarkBarViewEventTestBase {
786 protected: 787 protected:
(...skipping 924 matching lines...) Expand 10 before | Expand all | Expand 10 after
1711 Done(); 1712 Done();
1712 } 1713 }
1713 }; 1714 };
1714 1715
1715 #if defined(OS_WIN) 1716 #if defined(OS_WIN)
1716 #define MAYBE_BookmarkBarViewTest19_SiblingMenu DISABLED_SiblingMenu 1717 #define MAYBE_BookmarkBarViewTest19_SiblingMenu DISABLED_SiblingMenu
1717 #else 1718 #else
1718 #define MAYBE_BookmarkBarViewTest19_SiblingMenu SiblingMenu 1719 #define MAYBE_BookmarkBarViewTest19_SiblingMenu SiblingMenu
1719 #endif 1720 #endif
1720 VIEW_TEST(BookmarkBarViewTest19, MAYBE_BookmarkBarViewTest19_SiblingMenu) 1721 VIEW_TEST(BookmarkBarViewTest19, MAYBE_BookmarkBarViewTest19_SiblingMenu)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698