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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
7 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
8 #include "chrome/browser/download/download_service.h" | 8 #include "chrome/browser/download/download_service.h" |
9 #include "chrome/browser/download/download_service_factory.h" | 9 #include "chrome/browser/download/download_service_factory.h" |
10 #include "chrome/browser/net/url_request_mock_util.h" | 10 #include "chrome/browser/net/url_request_mock_util.h" |
11 #include "chrome/browser/notifications/balloon.h" | 11 #include "chrome/browser/notifications/balloon.h" |
12 #include "chrome/browser/notifications/balloon_collection_impl.h" | 12 #include "chrome/browser/notifications/balloon_collection_impl.h" |
13 #include "chrome/browser/notifications/desktop_notification_service.h" | 13 #include "chrome/browser/notifications/desktop_notification_service.h" |
14 #include "chrome/browser/notifications/notification.h" | 14 #include "chrome/browser/notifications/notification.h" |
15 #include "chrome/browser/notifications/notification_ui_manager.h" | 15 #include "chrome/browser/notifications/notification_ui_manager.h" |
16 #include "chrome/browser/prefs/browser_prefs.h" | 16 #include "chrome/browser/prefs/browser_prefs.h" |
17 #include "chrome/browser/prefs/pref_service.h" | 17 #include "chrome/browser/prefs/pref_service.h" |
18 #include "chrome/browser/profiles/profile.h" | 18 #include "chrome/browser/profiles/profile.h" |
19 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" | 19 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" |
20 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" | 20 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" |
| 21 #include "chrome/browser/ui/browser_finder.h" |
21 #include "chrome/browser/ui/browser_list.h" | 22 #include "chrome/browser/ui/browser_list.h" |
22 #include "chrome/browser/ui/browser_window.h" | 23 #include "chrome/browser/ui/browser_window.h" |
23 #include "chrome/browser/ui/find_bar/find_bar.h" | 24 #include "chrome/browser/ui/find_bar/find_bar.h" |
24 #include "chrome/browser/ui/find_bar/find_bar_controller.h" | 25 #include "chrome/browser/ui/find_bar/find_bar_controller.h" |
25 #include "chrome/browser/ui/panels/base_panel_browser_test.h" | 26 #include "chrome/browser/ui/panels/base_panel_browser_test.h" |
26 #include "chrome/browser/ui/panels/docked_panel_strip.h" | 27 #include "chrome/browser/ui/panels/docked_panel_strip.h" |
27 #include "chrome/browser/ui/panels/native_panel.h" | 28 #include "chrome/browser/ui/panels/native_panel.h" |
28 #include "chrome/browser/ui/panels/panel.h" | 29 #include "chrome/browser/ui/panels/panel.h" |
29 #include "chrome/browser/ui/panels/panel_manager.h" | 30 #include "chrome/browser/ui/panels/panel_manager.h" |
30 #include "chrome/browser/ui/panels/test_panel_mouse_watcher.h" | 31 #include "chrome/browser/ui/panels/test_panel_mouse_watcher.h" |
(...skipping 1398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1429 EXPECT_GT(panel->GetBounds().width(), initial_width); | 1430 EXPECT_GT(panel->GetBounds().width(), initial_width); |
1430 | 1431 |
1431 // Swapping tab contents back to the browser should close the panel. | 1432 // Swapping tab contents back to the browser should close the panel. |
1432 ui_test_utils::WindowedNotificationObserver signal( | 1433 ui_test_utils::WindowedNotificationObserver signal( |
1433 chrome::NOTIFICATION_BROWSER_CLOSED, | 1434 chrome::NOTIFICATION_BROWSER_CLOSED, |
1434 content::Source<Browser>(panel_browser)); | 1435 content::Source<Browser>(panel_browser)); |
1435 panel_browser->ConvertPopupToTabbedBrowser(); | 1436 panel_browser->ConvertPopupToTabbedBrowser(); |
1436 signal.Wait(); | 1437 signal.Wait(); |
1437 EXPECT_EQ(0, PanelManager::GetInstance()->num_panels()); | 1438 EXPECT_EQ(0, PanelManager::GetInstance()->num_panels()); |
1438 | 1439 |
1439 Browser* tabbed_browser = BrowserList::FindTabbedBrowser(profile, false); | 1440 Browser* tabbed_browser = browser::FindTabbedBrowser(profile, false); |
1440 EXPECT_EQ(contents, tabbed_browser->GetSelectedTabContentsWrapper()); | 1441 EXPECT_EQ(contents, tabbed_browser->GetSelectedTabContentsWrapper()); |
1441 tabbed_browser->window()->Close(); | 1442 tabbed_browser->window()->Close(); |
1442 } | 1443 } |
1443 | 1444 |
1444 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, SizeClamping) { | 1445 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, SizeClamping) { |
1445 // Using '0' sizes is equivalent of not providing sizes in API and causes | 1446 // Using '0' sizes is equivalent of not providing sizes in API and causes |
1446 // minimum sizes to be applied to facilitate auto-sizing. | 1447 // minimum sizes to be applied to facilitate auto-sizing. |
1447 CreatePanelParams params("Panel", gfx::Rect(), SHOW_AS_ACTIVE); | 1448 CreatePanelParams params("Panel", gfx::Rect(), SHOW_AS_ACTIVE); |
1448 Panel* panel = CreatePanelWithParams(params); | 1449 Panel* panel = CreatePanelWithParams(params); |
1449 EXPECT_EQ(panel->min_size().width(), panel->GetBounds().width()); | 1450 EXPECT_EQ(panel->min_size().width(), panel->GetBounds().width()); |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1704 EXPECT_EQ(2U, BrowserList::size()); | 1705 EXPECT_EQ(2U, BrowserList::size()); |
1705 ASSERT_FALSE(browser()->window()->IsDownloadShelfVisible()); | 1706 ASSERT_FALSE(browser()->window()->IsDownloadShelfVisible()); |
1706 ASSERT_FALSE(panel_browser->window()->IsDownloadShelfVisible()); | 1707 ASSERT_FALSE(panel_browser->window()->IsDownloadShelfVisible()); |
1707 | 1708 |
1708 ui_test_utils::WindowedNotificationObserver signal( | 1709 ui_test_utils::WindowedNotificationObserver signal( |
1709 chrome::NOTIFICATION_BROWSER_CLOSED, | 1710 chrome::NOTIFICATION_BROWSER_CLOSED, |
1710 content::Source<Browser>(browser())); | 1711 content::Source<Browser>(browser())); |
1711 browser()->CloseWindow(); | 1712 browser()->CloseWindow(); |
1712 signal.Wait(); | 1713 signal.Wait(); |
1713 ASSERT_EQ(1U, BrowserList::size()); | 1714 ASSERT_EQ(1U, BrowserList::size()); |
1714 ASSERT_EQ(NULL, Browser::GetTabbedBrowser(profile, false)); | 1715 ASSERT_EQ(NULL, browser::FindTabbedBrowser(profile, false)); |
1715 | 1716 |
1716 scoped_ptr<DownloadObserver> observer(new DownloadObserver(profile)); | 1717 scoped_ptr<DownloadObserver> observer(new DownloadObserver(profile)); |
1717 FilePath file(FILE_PATH_LITERAL("download-test1.lib")); | 1718 FilePath file(FILE_PATH_LITERAL("download-test1.lib")); |
1718 GURL download_url(URLRequestMockHTTPJob::GetMockUrl(file)); | 1719 GURL download_url(URLRequestMockHTTPJob::GetMockUrl(file)); |
1719 ui_test_utils::NavigateToURLWithDisposition( | 1720 ui_test_utils::NavigateToURLWithDisposition( |
1720 panel_browser, | 1721 panel_browser, |
1721 download_url, | 1722 download_url, |
1722 CURRENT_TAB, | 1723 CURRENT_TAB, |
1723 ui_test_utils::BROWSER_TEST_NONE); | 1724 ui_test_utils::BROWSER_TEST_NONE); |
1724 observer->WaitForDownload(); | 1725 observer->WaitForDownload(); |
1725 | 1726 |
1726 EXPECT_EQ(2U, BrowserList::size()); | 1727 EXPECT_EQ(2U, BrowserList::size()); |
1727 | 1728 |
1728 Browser* tabbed_browser = Browser::GetTabbedBrowser(profile, false); | 1729 Browser* tabbed_browser = browser::FindTabbedBrowser(profile, false); |
1729 EXPECT_EQ(1, tabbed_browser->tab_count()); | 1730 EXPECT_EQ(1, tabbed_browser->tab_count()); |
1730 ASSERT_TRUE(tabbed_browser->window()->IsDownloadShelfVisible()); | 1731 ASSERT_TRUE(tabbed_browser->window()->IsDownloadShelfVisible()); |
1731 tabbed_browser->CloseWindow(); | 1732 tabbed_browser->CloseWindow(); |
1732 | 1733 |
1733 EXPECT_EQ(1, panel_browser->tab_count()); | 1734 EXPECT_EQ(1, panel_browser->tab_count()); |
1734 ASSERT_FALSE(panel_browser->window()->IsDownloadShelfVisible()); | 1735 ASSERT_FALSE(panel_browser->window()->IsDownloadShelfVisible()); |
1735 | 1736 |
1736 panel_browser->CloseWindow(); | 1737 panel_browser->CloseWindow(); |
1737 } | 1738 } |
1738 | 1739 |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1896 // position when tall panel brings up its titlebar. | 1897 // position when tall panel brings up its titlebar. |
1897 CloseWindowAndWait(panel1->browser()); | 1898 CloseWindowAndWait(panel1->browser()); |
1898 EXPECT_EQ(balloon_bottom_after_tall_panel_titlebar_up, | 1899 EXPECT_EQ(balloon_bottom_after_tall_panel_titlebar_up, |
1899 GetBalloonBottomPosition(balloon)); | 1900 GetBalloonBottomPosition(balloon)); |
1900 | 1901 |
1901 // Closing the remaining tall panel should move the notification balloon back | 1902 // Closing the remaining tall panel should move the notification balloon back |
1902 // to its original position. | 1903 // to its original position. |
1903 CloseWindowAndWait(panel2->browser()); | 1904 CloseWindowAndWait(panel2->browser()); |
1904 EXPECT_EQ(original_balloon_bottom, GetBalloonBottomPosition(balloon)); | 1905 EXPECT_EQ(original_balloon_bottom, GetBalloonBottomPosition(balloon)); |
1905 } | 1906 } |
OLD | NEW |