OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/keyboard_codes.h" | 5 #include "base/keyboard_codes.h" |
6 #include "base/string_util.h" | 6 #include "base/string_util.h" |
7 #include "chrome/browser/automation/ui_controls.h" | 7 #include "chrome/browser/automation/ui_controls.h" |
8 #include "chrome/browser/bookmarks/bookmark_model.h" | 8 #include "chrome/browser/bookmarks/bookmark_model.h" |
9 #include "chrome/browser/bookmarks/bookmark_utils.h" | 9 #include "chrome/browser/bookmarks/bookmark_utils.h" |
10 #include "chrome/browser/pref_service.h" | 10 #include "chrome/browser/pref_service.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "views/controls/menu/submenu_view.h" | 24 #include "views/controls/menu/submenu_view.h" |
25 #include "views/views_delegate.h" | 25 #include "views/views_delegate.h" |
26 #include "views/window/window.h" | 26 #include "views/window/window.h" |
27 | 27 |
28 #if defined(OS_LINUX) | 28 #if defined(OS_LINUX) |
29 // See http://crbug.com/40040 for details. | 29 // See http://crbug.com/40040 for details. |
30 #define MAYBE_DND DISABLED_DND | 30 #define MAYBE_DND DISABLED_DND |
31 #define MAYBE_DNDToDifferentMenu DISABLED_DNDToDifferentMenu | 31 #define MAYBE_DNDToDifferentMenu DISABLED_DNDToDifferentMenu |
32 #define MAYBE_DNDBackToOriginatingMenu DISABLED_DNDBackToOriginatingMenu | 32 #define MAYBE_DNDBackToOriginatingMenu DISABLED_DNDBackToOriginatingMenu |
33 | 33 |
34 // See http://crbug.com/40039 for details. | 34 // Two bugs here. http://crbug.com/40039 for general Linux Views, and |
| 35 // http://crbug.com/47452 for ChromiumOS. |
35 #define MAYBE_KeyEvents DISABLED_KeyEvents | 36 #define MAYBE_KeyEvents DISABLED_KeyEvents |
36 | 37 |
37 // See http://crbug.com/47089 for details. | 38 // See http://crbug.com/47089 for details. |
38 #define MAYBE_CloseWithModalDialog DISABLED_CloseWithModalDialog | 39 #define MAYBE_CloseWithModalDialog DISABLED_CloseWithModalDialog |
39 #define MAYBE_CloseMenuAfterClosingContextMenu \ | 40 #define MAYBE_CloseMenuAfterClosingContextMenu \ |
40 DISABLED_CloseMenuAfterClosingContextMenu | 41 DISABLED_CloseMenuAfterClosingContextMenu |
41 #else | 42 #else |
42 | 43 |
43 #define MAYBE_DND DND | 44 #define MAYBE_DND DND |
44 #define MAYBE_DNDToDifferentMenu DNDToDifferentMenu | 45 #define MAYBE_DNDToDifferentMenu DNDToDifferentMenu |
(...skipping 1290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1335 views::TextButton* button = bb_view_->GetBookmarkButton(0); | 1336 views::TextButton* button = bb_view_->GetBookmarkButton(0); |
1336 ASSERT_TRUE(button->state() == views::CustomButton::BS_PUSHED); | 1337 ASSERT_TRUE(button->state() == views::CustomButton::BS_PUSHED); |
1337 | 1338 |
1338 // Close the window. | 1339 // Close the window. |
1339 window_->Close(); | 1340 window_->Close(); |
1340 window_ = NULL; | 1341 window_ = NULL; |
1341 } | 1342 } |
1342 }; | 1343 }; |
1343 | 1344 |
1344 VIEW_TEST(BookmarkBarViewTest16, DeleteMenu) | 1345 VIEW_TEST(BookmarkBarViewTest16, DeleteMenu) |
OLD | NEW |