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

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

Issue 378333003: Allow menus to stay open during a child view's drag and drop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test Fix Created 6 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/menu_view_drag_and_drop_test.cc » ('j') | 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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 class TestingPageNavigator : public PageNavigator { 200 class TestingPageNavigator : public PageNavigator {
201 public: 201 public:
202 virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE { 202 virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE {
203 url_ = params.url; 203 url_ = params.url;
204 return NULL; 204 return NULL;
205 } 205 }
206 206
207 GURL url_; 207 GURL url_;
208 }; 208 };
209 209
210 // TODO(erg): Fix bookmark DBD tests on linux_aura. crbug.com/163931 210 // TODO(erg): Fix bookmark DND tests on linux_aura. crbug.com/163931
211 #if defined(OS_LINUX) && defined(USE_AURA) 211 #if defined(OS_LINUX) && defined(USE_AURA)
212 #define MAYBE(x) DISABLED_##x 212 #define MAYBE(x) DISABLED_##x
213 #else 213 #else
214 #define MAYBE(x) x 214 #define MAYBE(x) x
215 #endif 215 #endif
216 216
217 } // namespace 217 } // namespace
218 218
219 // Base class for event generating bookmark view tests. These test are intended 219 // Base class for event generating bookmark view tests. These test are intended
220 // to exercise View's menus, but that's easier done with BookmarkBarView rather 220 // to exercise View's menus, but that's easier done with BookmarkBarView rather
(...skipping 1752 matching lines...) Expand 10 before | Expand all | Expand 10 after
1973 EXPECT_TRUE(bb_view_->GetContextMenu() == NULL); 1973 EXPECT_TRUE(bb_view_->GetContextMenu() == NULL);
1974 EXPECT_TRUE(bb_view_->GetMenu() == NULL); 1974 EXPECT_TRUE(bb_view_->GetMenu() == NULL);
1975 1975
1976 Done(); 1976 Done();
1977 } 1977 }
1978 1978
1979 BookmarkContextMenuNotificationObserver observer_; 1979 BookmarkContextMenuNotificationObserver observer_;
1980 }; 1980 };
1981 1981
1982 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder) 1982 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/menu_view_drag_and_drop_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698