| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/tabs/tab_drag_controller_interactive_uitest.h" | 5 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/property_bag.h" | |
| 11 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| 12 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/browser_list.h" | 12 #include "chrome/browser/ui/browser_list.h" |
| 14 #include "chrome/browser/ui/browser_window.h" | 13 #include "chrome/browser/ui/browser_window.h" |
| 15 #include "chrome/browser/ui/tab_contents/tab_contents.h" | 14 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
| 16 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 17 #include "chrome/browser/ui/views/frame/browser_view.h" | 16 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 18 #include "chrome/browser/ui/views/tabs/tab.h" | 17 #include "chrome/browser/ui/views/tabs/tab.h" |
| 19 #include "chrome/browser/ui/views/tabs/tab_drag_controller.h" | 18 #include "chrome/browser/ui/views/tabs/tab_drag_controller.h" |
| 20 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 19 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 353 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( | 352 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( |
| 354 browser2, ui::VKEY_ESCAPE, false, false, false, false)); | 353 browser2, ui::VKEY_ESCAPE, false, false, false, false)); |
| 355 | 354 |
| 356 ASSERT_FALSE(tab_strip->IsDragSessionActive()); | 355 ASSERT_FALSE(tab_strip->IsDragSessionActive()); |
| 357 ASSERT_FALSE(tab_strip2->IsDragSessionActive()); | 356 ASSERT_FALSE(tab_strip2->IsDragSessionActive()); |
| 358 ASSERT_FALSE(TabDragController::IsActive()); | 357 ASSERT_FALSE(TabDragController::IsActive()); |
| 359 ASSERT_EQ(2u, BrowserList::size()); | 358 ASSERT_EQ(2u, BrowserList::size()); |
| 360 EXPECT_EQ("0 1", IDString(browser()->tab_strip_model())); | 359 EXPECT_EQ("0 1", IDString(browser()->tab_strip_model())); |
| 361 EXPECT_EQ("100", IDString(browser2->tab_strip_model())); | 360 EXPECT_EQ("100", IDString(browser2->tab_strip_model())); |
| 362 } | 361 } |
| OLD | NEW |