OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/location.h" | 5 #include "base/location.h" |
6 #include "base/run_loop.h" | 6 #include "base/run_loop.h" |
7 #include "base/single_thread_task_runner.h" | 7 #include "base/single_thread_task_runner.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "chrome/browser/extensions/extension_browsertest.h" | 9 #include "chrome/browser/extensions/extension_browsertest.h" |
10 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" | 10 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" |
11 #include "chrome/browser/ui/views/frame/browser_view.h" | 11 #include "chrome/browser/ui/views/frame/browser_view.h" |
12 #include "chrome/browser/ui/views/frame/test_with_browser_view.h" | 12 #include "chrome/browser/ui/views/frame/test_with_browser_view.h" |
13 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" | 13 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" |
tapted
2016/02/09 22:06:07
nit: Sorry - I missed this earlier, but this #incl
themblsha
2016/02/10 10:28:31
Yep, compiles just fine.
| |
14 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" | 14 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" |
15 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" | 15 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" |
16 #include "chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h" | 16 #include "chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h" |
17 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" | 17 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
18 #include "chrome/test/base/interactive_test_utils.h" | 18 #include "chrome/test/base/interactive_test_utils.h" |
19 #include "extensions/common/feature_switch.h" | 19 #include "extensions/common/feature_switch.h" |
20 | 20 |
21 // Borrowed from chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc, | 21 // Borrowed from chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc, |
22 // since these are also disabled on Linux for drag and drop. | 22 // since these are also disabled on Linux for drag and drop. |
23 // TODO(erg): Fix DND tests on linux_aura. crbug.com/163931 | 23 // TODO(erg): Fix DND tests on linux_aura. crbug.com/163931 |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
155 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") | 155 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") |
156 .AppendASCII("browser_action") | 156 .AppendASCII("browser_action") |
157 .AppendASCII("basics"))); | 157 .AppendASCII("basics"))); |
158 base::RunLoop().RunUntilIdle(); // Ensure the extension is fully loaded. | 158 base::RunLoop().RunUntilIdle(); // Ensure the extension is fully loaded. |
159 | 159 |
160 ASSERT_EQ(1u, browser_actions()->VisibleBrowserActions()); | 160 ASSERT_EQ(1u, browser_actions()->VisibleBrowserActions()); |
161 | 161 |
162 ToolbarActionView* view = browser_actions()->GetToolbarActionViewAt(0); | 162 ToolbarActionView* view = browser_actions()->GetToolbarActionViewAt(0); |
163 ASSERT_TRUE(view); | 163 ASSERT_TRUE(view); |
164 | 164 |
165 gfx::Point browser_action_view_loc = test::GetCenterInScreenCoordinates(view); | 165 gfx::Point browser_action_view_loc = |
166 gfx::Point app_button_loc = | 166 ui_test_utils::GetCenterInScreenCoordinates(view); |
167 test::GetCenterInScreenCoordinates(toolbar_view()->app_menu_button()); | 167 gfx::Point app_button_loc = ui_test_utils::GetCenterInScreenCoordinates( |
168 toolbar_view()->app_menu_button()); | |
168 | 169 |
169 // Perform a drag and drop from the browser action view to the app button, | 170 // Perform a drag and drop from the browser action view to the app button, |
170 // which should open the app menu. | 171 // which should open the app menu. |
171 DoDragAndDrop(browser_action_view_loc, app_button_loc); | 172 DoDragAndDrop(browser_action_view_loc, app_button_loc); |
172 } | 173 } |
OLD | NEW |