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

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

Issue 237873002: Re-enable DND tests failing on Win64 build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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/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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 class TestingPageNavigator : public PageNavigator { 64 class TestingPageNavigator : public PageNavigator {
65 public: 65 public:
66 virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE { 66 virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE {
67 url_ = params.url; 67 url_ = params.url;
68 return NULL; 68 return NULL;
69 } 69 }
70 70
71 GURL url_; 71 GURL url_;
72 }; 72 };
73 73
74 // TODO(jschuh): Fix bookmark DND tests on Win64. crbug.com/244605
75 // TODO(erg): Fix bookmark DBD tests on linux_aura. crbug.com/163931 74 // TODO(erg): Fix bookmark DBD tests on linux_aura. crbug.com/163931
76 #if (defined(OS_WIN) && defined(ARCH_CPU_X86_64)) || \ 75 #if defined(OS_LINUX) && defined(USE_AURA)
77 (defined(OS_LINUX) && defined(USE_AURA))
78 #define MAYBE(x) DISABLED_##x 76 #define MAYBE(x) DISABLED_##x
79 #else 77 #else
80 #define MAYBE(x) x 78 #define MAYBE(x) x
81 #endif 79 #endif
82 80
83 } // namespace 81 } // namespace
84 82
85 // Base class for event generating bookmark view tests. These test are intended 83 // Base class for event generating bookmark view tests. These test are intended
86 // to exercise View's menus, but that's easier done with BookmarkBarView rather 84 // to exercise View's menus, but that's easier done with BookmarkBarView rather
87 // than View's menu itself. 85 // than View's menu itself.
(...skipping 1745 matching lines...) Expand 10 before | Expand all | Expand 10 after
1833 EXPECT_TRUE(bb_view_->GetContextMenu() == NULL); 1831 EXPECT_TRUE(bb_view_->GetContextMenu() == NULL);
1834 EXPECT_TRUE(bb_view_->GetMenu() == NULL); 1832 EXPECT_TRUE(bb_view_->GetMenu() == NULL);
1835 1833
1836 Done(); 1834 Done();
1837 } 1835 }
1838 1836
1839 BookmarkContextMenuNotificationObserver observer_; 1837 BookmarkContextMenuNotificationObserver observer_;
1840 }; 1838 };
1841 1839
1842 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder) 1840 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder)
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