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/run_loop.h" | 5 #include "base/run_loop.h" |
6 #include "chrome/browser/extensions/extension_browsertest.h" | 6 #include "chrome/browser/extensions/extension_browsertest.h" |
7 #include "chrome/browser/ui/views/frame/browser_view.h" | 7 #include "chrome/browser/ui/views/frame/browser_view.h" |
8 #include "chrome/browser/ui/views/frame/test_with_browser_view.h" | 8 #include "chrome/browser/ui/views/frame/test_with_browser_view.h" |
9 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" | 9 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" |
10 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" | 10 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 | 39 |
40 // A function to perform testing actions while in the drag operation from | 40 // A function to perform testing actions while in the drag operation from |
41 // DoDragAndDrop. | 41 // DoDragAndDrop. |
42 void TestWhileInDragOperation(); | 42 void TestWhileInDragOperation(); |
43 | 43 |
44 private: | 44 private: |
45 // Finishes the drag-and-drop operation started in DoDragAndDrop(). | 45 // Finishes the drag-and-drop operation started in DoDragAndDrop(). |
46 void FinishDragAndDrop(const base::Closure& quit_closure); | 46 void FinishDragAndDrop(const base::Closure& quit_closure); |
47 | 47 |
48 // InProcessBrowserTest: | 48 // InProcessBrowserTest: |
49 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; | 49 virtual void SetUpCommandLine(base::CommandLine* command_line) override; |
50 virtual void SetUpOnMainThread() OVERRIDE; | 50 virtual void SetUpOnMainThread() override; |
51 virtual void TearDownOnMainThread() OVERRIDE; | 51 virtual void TearDownOnMainThread() override; |
52 | 52 |
53 ToolbarView* toolbar_view_; | 53 ToolbarView* toolbar_view_; |
54 | 54 |
55 BrowserActionsContainer* browser_actions_; | 55 BrowserActionsContainer* browser_actions_; |
56 | 56 |
57 // The drag-and-drop background thread. | 57 // The drag-and-drop background thread. |
58 scoped_ptr<base::Thread> dnd_thread_; | 58 scoped_ptr<base::Thread> dnd_thread_; |
59 | 59 |
60 // Override the extensions-action-redesign switch. | 60 // Override the extensions-action-redesign switch. |
61 scoped_ptr<extensions::FeatureSwitch::ScopedOverride> feature_override_; | 61 scoped_ptr<extensions::FeatureSwitch::ScopedOverride> feature_override_; |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 ASSERT_TRUE(view); | 156 ASSERT_TRUE(view); |
157 | 157 |
158 gfx::Point browser_action_view_loc = test::GetCenterInScreenCoordinates(view); | 158 gfx::Point browser_action_view_loc = test::GetCenterInScreenCoordinates(view); |
159 gfx::Point wrench_button_loc = | 159 gfx::Point wrench_button_loc = |
160 test::GetCenterInScreenCoordinates(toolbar_view()->app_menu()); | 160 test::GetCenterInScreenCoordinates(toolbar_view()->app_menu()); |
161 | 161 |
162 // Perform a drag and drop from the browser action view to the wrench button, | 162 // Perform a drag and drop from the browser action view to the wrench button, |
163 // which should open the wrench menu. | 163 // which should open the wrench menu. |
164 DoDragAndDrop(browser_action_view_loc, wrench_button_loc); | 164 DoDragAndDrop(browser_action_view_loc, wrench_button_loc); |
165 } | 165 } |
OLD | NEW |