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/message_loop/message_loop.h" |
12 #include "base/message_loop/message_loop_proxy.h" | 12 #include "base/message_loop/message_loop_proxy.h" |
13 #include "chrome/browser/ui/browser_tabstrip.h" | 13 #include "chrome/browser/ui/browser_tabstrip.h" |
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 14 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
15 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 15 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
16 #include "chrome/browser/ui/views/frame/browser_view.h" | 16 #include "chrome/browser/ui/views/frame/browser_view.h" |
17 #include "chrome/browser/ui/views/tabs/tab.h" | 17 #include "chrome/browser/ui/views/tabs/tab.h" |
18 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 18 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
19 #include "chrome/common/chrome_switches.h" | 19 #include "chrome/common/chrome_switches.h" |
20 #include "chrome/test/base/in_process_browser_test.h" | 20 #include "chrome/test/base/in_process_browser_test.h" |
21 #include "chrome/test/base/ui_test_utils.h" | |
22 #include "content/public/browser/notification_service.h" | 21 #include "content/public/browser/notification_service.h" |
23 #include "content/public/common/url_constants.h" | 22 #include "content/public/common/url_constants.h" |
24 #include "content/public/test/test_utils.h" | 23 #include "content/public/test/test_utils.h" |
25 #include "ui/aura/window.h" | 24 #include "ui/aura/window.h" |
26 #include "ui/events/event_utils.h" | 25 #include "ui/events/event_utils.h" |
27 #include "ui/events/test/event_generator.h" | 26 #include "ui/events/test/event_generator.h" |
28 | 27 |
29 #if defined(OS_CHROMEOS) | 28 #if defined(OS_CHROMEOS) |
30 #include "chromeos/chromeos_switches.h" | 29 #include "chromeos/chromeos_switches.h" |
31 #endif | 30 #endif |
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
412 IN_PROC_BROWSER_TEST_F(TabScrubberTest, CloseBrowser) { | 411 IN_PROC_BROWSER_TEST_F(TabScrubberTest, CloseBrowser) { |
413 AddTabs(browser(), 1); | 412 AddTabs(browser(), 1); |
414 | 413 |
415 SendScrubEvent(browser(), 0); | 414 SendScrubEvent(browser(), 0); |
416 EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending()); | 415 EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending()); |
417 browser()->window()->Close(); | 416 browser()->window()->Close(); |
418 EXPECT_FALSE(TabScrubber::GetInstance()->IsActivationPending()); | 417 EXPECT_FALSE(TabScrubber::GetInstance()->IsActivationPending()); |
419 } | 418 } |
420 | 419 |
421 #endif // defined(OS_CHROMEOS) | 420 #endif // defined(OS_CHROMEOS) |
OLD | NEW |