| 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" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 // InProcessBrowserTest: | 52 // InProcessBrowserTest: |
| 53 void SetUpCommandLine(base::CommandLine* command_line) override; | 53 void SetUpCommandLine(base::CommandLine* command_line) override; |
| 54 void SetUpOnMainThread() override; | 54 void SetUpOnMainThread() override; |
| 55 void TearDownOnMainThread() override; | 55 void TearDownOnMainThread() override; |
| 56 | 56 |
| 57 ToolbarView* toolbar_view_; | 57 ToolbarView* toolbar_view_; |
| 58 | 58 |
| 59 BrowserActionsContainer* browser_actions_; | 59 BrowserActionsContainer* browser_actions_; |
| 60 | 60 |
| 61 // The drag-and-drop background thread. | 61 // The drag-and-drop background thread. |
| 62 scoped_ptr<base::Thread> dnd_thread_; | 62 std::unique_ptr<base::Thread> dnd_thread_; |
| 63 | 63 |
| 64 // Override the extensions-action-redesign switch. | 64 // Override the extensions-action-redesign switch. |
| 65 scoped_ptr<extensions::FeatureSwitch::ScopedOverride> feature_override_; | 65 std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> feature_override_; |
| 66 }; | 66 }; |
| 67 | 67 |
| 68 ToolbarViewInteractiveUITest::ToolbarViewInteractiveUITest() | 68 ToolbarViewInteractiveUITest::ToolbarViewInteractiveUITest() |
| 69 : toolbar_view_(NULL), | 69 : toolbar_view_(NULL), |
| 70 browser_actions_(NULL) { | 70 browser_actions_(NULL) { |
| 71 } | 71 } |
| 72 | 72 |
| 73 ToolbarViewInteractiveUITest::~ToolbarViewInteractiveUITest() { | 73 ToolbarViewInteractiveUITest::~ToolbarViewInteractiveUITest() { |
| 74 } | 74 } |
| 75 | 75 |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 | 163 |
| 164 gfx::Point browser_action_view_loc = | 164 gfx::Point browser_action_view_loc = |
| 165 ui_test_utils::GetCenterInScreenCoordinates(view); | 165 ui_test_utils::GetCenterInScreenCoordinates(view); |
| 166 gfx::Point app_button_loc = ui_test_utils::GetCenterInScreenCoordinates( | 166 gfx::Point app_button_loc = ui_test_utils::GetCenterInScreenCoordinates( |
| 167 toolbar_view()->app_menu_button()); | 167 toolbar_view()->app_menu_button()); |
| 168 | 168 |
| 169 // Perform a drag and drop from the browser action view to the app button, | 169 // Perform a drag and drop from the browser action view to the app button, |
| 170 // which should open the app menu. | 170 // which should open the app menu. |
| 171 DoDragAndDrop(browser_action_view_loc, app_button_loc); | 171 DoDragAndDrop(browser_action_view_loc, app_button_loc); |
| 172 } | 172 } |
| OLD | NEW |