| 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/ash/tab_scrubber.h" | 5 #include "chrome/browser/ui/views/ash/tab_scrubber.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "ash/display/event_transformation_handler.h" | 9 #include "ash/display/event_transformation_handler.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 browser2->window()->Activate(); | 322 browser2->window()->Activate(); |
| 323 ASSERT_TRUE(browser2->window()->IsActive()); | 323 ASSERT_TRUE(browser2->window()->IsActive()); |
| 324 ASSERT_FALSE(browser()->window()->IsActive()); | 324 ASSERT_FALSE(browser()->window()->IsActive()); |
| 325 AddTabs(browser2, 1); | 325 AddTabs(browser2, 1); |
| 326 | 326 |
| 327 Scrub(browser2, 0, EACH_TAB); | 327 Scrub(browser2, 0, EACH_TAB); |
| 328 EXPECT_EQ(0, browser2->tab_strip_model()->active_index()); | 328 EXPECT_EQ(0, browser2->tab_strip_model()->active_index()); |
| 329 } | 329 } |
| 330 | 330 |
| 331 // Tests that tab scrubbing works correctly for a full-screen browser. | 331 // Tests that tab scrubbing works correctly for a full-screen browser. |
| 332 IN_PROC_BROWSER_TEST_F(TabScrubberTest, FullScreenBrowser) { | 332 // TODO(crbug.com/708612): Re-enable the test after the bug is fixed. |
| 333 IN_PROC_BROWSER_TEST_F(TabScrubberTest, DISABLED_FullScreenBrowser) { |
| 333 AddTabs(browser(), 6); | 334 AddTabs(browser(), 6); |
| 334 browser()->tab_strip_model()->ActivateTabAt(4, false); | 335 browser()->tab_strip_model()->ActivateTabAt(4, false); |
| 335 | 336 |
| 336 chrome::ToggleFullscreenMode(browser()); | 337 chrome::ToggleFullscreenMode(browser()); |
| 337 BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow( | 338 BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow( |
| 338 browser()->window()->GetNativeWindow()); | 339 browser()->window()->GetNativeWindow()); |
| 339 ImmersiveModeController* immersive_controller = | 340 ImmersiveModeController* immersive_controller = |
| 340 browser_view->immersive_mode_controller(); | 341 browser_view->immersive_mode_controller(); |
| 341 EXPECT_TRUE(immersive_controller->IsEnabled()); | 342 EXPECT_TRUE(immersive_controller->IsEnabled()); |
| 342 | 343 |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 542 | 543 |
| 543 SendScrubEvent(browser(), 1); | 544 SendScrubEvent(browser(), 1); |
| 544 EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending()); | 545 EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending()); |
| 545 browser()->tab_strip_model()->ToggleSelectionAt(0); | 546 browser()->tab_strip_model()->ToggleSelectionAt(0); |
| 546 browser()->tab_strip_model()->ToggleSelectionAt(2); | 547 browser()->tab_strip_model()->ToggleSelectionAt(2); |
| 547 browser()->tab_strip_model()->MoveSelectedTabsTo(2); | 548 browser()->tab_strip_model()->MoveSelectedTabsTo(2); |
| 548 EXPECT_EQ(0, TabScrubber::GetInstance()->highlighted_tab()); | 549 EXPECT_EQ(0, TabScrubber::GetInstance()->highlighted_tab()); |
| 549 } | 550 } |
| 550 | 551 |
| 551 #endif // defined(OS_CHROMEOS) | 552 #endif // defined(OS_CHROMEOS) |
| OLD | NEW |