| 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 "ash/display/event_transformation_handler.h" | 7 #include "ash/display/event_transformation_handler.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/message_loop/message_loop.h" | 11 #include "base/run_loop.h" |
| 12 #include "base/message_loop/message_loop_proxy.h" | |
| 13 #include "chrome/browser/ui/browser_tabstrip.h" | 12 #include "chrome/browser/ui/browser_tabstrip.h" |
| 14 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 15 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 14 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
| 16 #include "chrome/browser/ui/views/frame/browser_view.h" | 15 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 17 #include "chrome/browser/ui/views/tabs/tab.h" | 16 #include "chrome/browser/ui/views/tabs/tab.h" |
| 18 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 17 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
| 19 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
| 20 #include "chrome/test/base/in_process_browser_test.h" | 19 #include "chrome/test/base/in_process_browser_test.h" |
| 21 #include "content/public/browser/notification_service.h" | 20 #include "content/public/browser/notification_service.h" |
| 22 #include "content/public/common/url_constants.h" | 21 #include "content/public/common/url_constants.h" |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 409 IN_PROC_BROWSER_TEST_F(TabScrubberTest, CloseBrowser) { | 408 IN_PROC_BROWSER_TEST_F(TabScrubberTest, CloseBrowser) { |
| 410 AddTabs(browser(), 1); | 409 AddTabs(browser(), 1); |
| 411 | 410 |
| 412 SendScrubEvent(browser(), 0); | 411 SendScrubEvent(browser(), 0); |
| 413 EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending()); | 412 EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending()); |
| 414 browser()->window()->Close(); | 413 browser()->window()->Close(); |
| 415 EXPECT_FALSE(TabScrubber::GetInstance()->IsActivationPending()); | 414 EXPECT_FALSE(TabScrubber::GetInstance()->IsActivationPending()); |
| 416 } | 415 } |
| 417 | 416 |
| 418 #endif // defined(OS_CHROMEOS) | 417 #endif // defined(OS_CHROMEOS) |
| OLD | NEW |