| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/thread_task_runner_handle.h" | 6 #include "base/threading/thread_task_runner_handle.h" |
| 7 #include "chrome/browser/extensions/browser_action_test_util.h" | 7 #include "chrome/browser/extensions/browser_action_test_util.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/browser_commands.h" | 9 #include "chrome/browser/ui/browser_commands.h" |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 11 #include "chrome/browser/ui/toolbar/media_router_action.h" | 11 #include "chrome/browser/ui/toolbar/media_router_action.h" |
| 12 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h" | 12 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h" |
| 13 #include "chrome/browser/ui/views/frame/browser_view.h" | 13 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 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/toolbar_action_view.h" | 16 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 | 125 |
| 126 // Navigate away. | 126 // Navigate away. |
| 127 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); | 127 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); |
| 128 | 128 |
| 129 // The navigation should have removed the previously created dialog. | 129 // The navigation should have removed the previously created dialog. |
| 130 // We expect a new dialog WebContents to be created by calling this. | 130 // We expect a new dialog WebContents to be created by calling this. |
| 131 OpenMediaRouterDialogAndWaitForNewWebContents(); | 131 OpenMediaRouterDialogAndWaitForNewWebContents(); |
| 132 } | 132 } |
| 133 | 133 |
| 134 } // namespace media_router | 134 } // namespace media_router |
| OLD | NEW |