OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/ui/views/toolbar/browser_actions_container.h" | 5 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" |
6 | 6 |
| 7 #include <stddef.h> |
| 8 |
| 9 #include "base/macros.h" |
7 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" | 10 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" |
8 #include "chrome/browser/extensions/browser_action_test_util.h" | 11 #include "chrome/browser/extensions/browser_action_test_util.h" |
9 #include "chrome/browser/extensions/extension_context_menu_model.h" | 12 #include "chrome/browser/extensions/extension_context_menu_model.h" |
10 #include "chrome/browser/ui/browser_window.h" | 13 #include "chrome/browser/ui/browser_window.h" |
11 #include "chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h" | 14 #include "chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h" |
12 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" | 15 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" |
13 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h" | 16 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h" |
14 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" | 17 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" |
15 #include "chrome/browser/ui/views/frame/browser_view.h" | 18 #include "chrome/browser/ui/views/frame/browser_view.h" |
16 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h" | 19 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h" |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
447 | 450 |
448 main_bar()->OnDragUpdated(target_event3); | 451 main_bar()->OnDragUpdated(target_event3); |
449 main_bar()->OnPerformDrop(target_event3); | 452 main_bar()->OnPerformDrop(target_event3); |
450 | 453 |
451 // Order should be A C B, and there should be no extensions in overflow. | 454 // Order should be A C B, and there should be no extensions in overflow. |
452 EXPECT_EQ(extension_a()->id(), main_bar()->GetIdAt(0u)); | 455 EXPECT_EQ(extension_a()->id(), main_bar()->GetIdAt(0u)); |
453 EXPECT_EQ(extension_c()->id(), main_bar()->GetIdAt(1u)); | 456 EXPECT_EQ(extension_c()->id(), main_bar()->GetIdAt(1u)); |
454 EXPECT_EQ(extension_b()->id(), main_bar()->GetIdAt(2u)); | 457 EXPECT_EQ(extension_b()->id(), main_bar()->GetIdAt(2u)); |
455 EXPECT_TRUE(VerifyVisibleCount(3u)); | 458 EXPECT_TRUE(VerifyVisibleCount(3u)); |
456 } | 459 } |
OLD | NEW |