| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "app/keyboard_codes.h" | 5 #include "app/keyboard_codes.h" |
| 6 #include "base/string_number_conversions.h" | 6 #include "base/string_number_conversions.h" |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "chrome/browser/automation/ui_controls.h" | 9 #include "chrome/browser/automation/ui_controls.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 11 #include "chrome/browser/bookmarks/bookmark_utils.h" | 11 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 12 #include "chrome/browser/prefs/pref_service.h" | 12 #include "chrome/browser/prefs/pref_service.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 14 #include "chrome/browser/tab_contents/page_navigator.h" | 14 #include "chrome/browser/tab_contents/page_navigator.h" |
| 15 #include "chrome/browser/views/bookmark_bar_view.h" | 15 #include "chrome/browser/ui/views/bookmark_bar_view.h" |
| 16 #include "chrome/common/notification_service.h" | 16 #include "chrome/common/notification_service.h" |
| 17 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| 18 #include "chrome/test/testing_profile.h" | 18 #include "chrome/test/testing_profile.h" |
| 19 #include "chrome/test/interactive_ui/view_event_test_base.h" | 19 #include "chrome/test/interactive_ui/view_event_test_base.h" |
| 20 #include "chrome/test/ui_test_utils.h" | 20 #include "chrome/test/ui_test_utils.h" |
| 21 #include "grit/generated_resources.h" | 21 #include "grit/generated_resources.h" |
| 22 #include "ui/base/clipboard/clipboard.h" | 22 #include "ui/base/clipboard/clipboard.h" |
| 23 #include "views/controls/button/menu_button.h" | 23 #include "views/controls/button/menu_button.h" |
| 24 #include "views/controls/button/text_button.h" | 24 #include "views/controls/button/text_button.h" |
| 25 #include "views/controls/menu/menu_controller.h" | 25 #include "views/controls/menu/menu_controller.h" |
| (...skipping 1326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1352 ASSERT_TRUE(button->state() == views::CustomButton::BS_PUSHED); | 1352 ASSERT_TRUE(button->state() == views::CustomButton::BS_PUSHED); |
| 1353 | 1353 |
| 1354 // Close the window. | 1354 // Close the window. |
| 1355 window_->Close(); | 1355 window_->Close(); |
| 1356 window_ = NULL; | 1356 window_ = NULL; |
| 1357 } | 1357 } |
| 1358 }; | 1358 }; |
| 1359 | 1359 |
| 1360 // Disabled, http://crbug.com/64303. | 1360 // Disabled, http://crbug.com/64303. |
| 1361 VIEW_TEST(BookmarkBarViewTest16, DISABLED_DeleteMenu) | 1361 VIEW_TEST(BookmarkBarViewTest16, DISABLED_DeleteMenu) |
| OLD | NEW |