OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 <stddef.h> | 5 #include <stddef.h> |
6 #include <stdint.h> | 6 #include <stdint.h> |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 1079 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1090 | 1090 |
1091 // Disabled, http://crbug.com/159214 . | 1091 // Disabled, http://crbug.com/159214 . |
1092 IN_PROC_BROWSER_TEST_F(BeforeUnloadAtQuitWithTwoWindows, | 1092 IN_PROC_BROWSER_TEST_F(BeforeUnloadAtQuitWithTwoWindows, |
1093 DISABLED_IfThisTestTimesOutItIndicatesFAILURE) { | 1093 DISABLED_IfThisTestTimesOutItIndicatesFAILURE) { |
1094 // In the first browser, set up a page that has a beforeunload handler. | 1094 // In the first browser, set up a page that has a beforeunload handler. |
1095 GURL url(std::string("data:text/html,") + kBeforeUnloadHTML); | 1095 GURL url(std::string("data:text/html,") + kBeforeUnloadHTML); |
1096 ui_test_utils::NavigateToURL(browser(), url); | 1096 ui_test_utils::NavigateToURL(browser(), url); |
1097 | 1097 |
1098 // Open a second browser window at about:blank. | 1098 // Open a second browser window at about:blank. |
1099 ui_test_utils::BrowserAddedObserver browser_added_observer; | 1099 ui_test_utils::BrowserAddedObserver browser_added_observer; |
1100 chrome::NewEmptyWindow(browser()->profile(), chrome::GetActiveDesktop()); | 1100 chrome::NewEmptyWindow(browser()->profile()); |
1101 Browser* second_window = browser_added_observer.WaitForSingleNewBrowser(); | 1101 Browser* second_window = browser_added_observer.WaitForSingleNewBrowser(); |
1102 ui_test_utils::NavigateToURL(second_window, GURL(url::kAboutBlankURL)); | 1102 ui_test_utils::NavigateToURL(second_window, GURL(url::kAboutBlankURL)); |
1103 | 1103 |
1104 // Tell the application to quit. IDC_EXIT calls AttemptUserExit, which on | 1104 // Tell the application to quit. IDC_EXIT calls AttemptUserExit, which on |
1105 // everything but ChromeOS allows unload handlers to block exit. On that | 1105 // everything but ChromeOS allows unload handlers to block exit. On that |
1106 // platform, though, it exits unconditionally. See the comment and bug ID | 1106 // platform, though, it exits unconditionally. See the comment and bug ID |
1107 // in AttemptUserExit() in application_lifetime.cc. | 1107 // in AttemptUserExit() in application_lifetime.cc. |
1108 #if defined(OS_CHROMEOS) | 1108 #if defined(OS_CHROMEOS) |
1109 chrome::AttemptExit(); | 1109 chrome::AttemptExit(); |
1110 #else | 1110 #else |
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1723 EXPECT_NE(app_name.find(extension_app->id()), std::string::npos) | 1723 EXPECT_NE(app_name.find(extension_app->id()), std::string::npos) |
1724 << "Name " << app_name << " should contain id "<< extension_app->id(); | 1724 << "Name " << app_name << " should contain id "<< extension_app->id(); |
1725 } | 1725 } |
1726 #endif // !defined(OS_MACOSX) | 1726 #endif // !defined(OS_MACOSX) |
1727 | 1727 |
1728 // Makes sure the browser doesn't crash when | 1728 // Makes sure the browser doesn't crash when |
1729 // set_show_state(ui::SHOW_STATE_MAXIMIZED) has been invoked. | 1729 // set_show_state(ui::SHOW_STATE_MAXIMIZED) has been invoked. |
1730 IN_PROC_BROWSER_TEST_F(BrowserTest, StartMaximized) { | 1730 IN_PROC_BROWSER_TEST_F(BrowserTest, StartMaximized) { |
1731 Browser::Type types[] = { Browser::TYPE_TABBED, Browser::TYPE_POPUP }; | 1731 Browser::Type types[] = { Browser::TYPE_TABBED, Browser::TYPE_POPUP }; |
1732 for (size_t i = 0; i < arraysize(types); ++i) { | 1732 for (size_t i = 0; i < arraysize(types); ++i) { |
1733 Browser::CreateParams params(types[i], browser()->profile(), | 1733 Browser::CreateParams params(types[i], browser()->profile()); |
1734 browser()->host_desktop_type()); | |
1735 params.initial_show_state = ui::SHOW_STATE_MAXIMIZED; | 1734 params.initial_show_state = ui::SHOW_STATE_MAXIMIZED; |
1736 AddBlankTabAndShow(new Browser(params)); | 1735 AddBlankTabAndShow(new Browser(params)); |
1737 } | 1736 } |
1738 } | 1737 } |
1739 | 1738 |
1740 // Aura doesn't support minimized window. crbug.com/104571. | 1739 // Aura doesn't support minimized window. crbug.com/104571. |
1741 #if defined(USE_AURA) | 1740 #if defined(USE_AURA) |
1742 #define MAYBE_StartMinimized DISABLED_StartMinimized | 1741 #define MAYBE_StartMinimized DISABLED_StartMinimized |
1743 #else | 1742 #else |
1744 #define MAYBE_StartMinimized StartMinimized | 1743 #define MAYBE_StartMinimized StartMinimized |
1745 #endif | 1744 #endif |
1746 // Makes sure the browser doesn't crash when | 1745 // Makes sure the browser doesn't crash when |
1747 // set_show_state(ui::SHOW_STATE_MINIMIZED) has been invoked. | 1746 // set_show_state(ui::SHOW_STATE_MINIMIZED) has been invoked. |
1748 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_StartMinimized) { | 1747 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_StartMinimized) { |
1749 Browser::Type types[] = { Browser::TYPE_TABBED, Browser::TYPE_POPUP }; | 1748 Browser::Type types[] = { Browser::TYPE_TABBED, Browser::TYPE_POPUP }; |
1750 for (size_t i = 0; i < arraysize(types); ++i) { | 1749 for (size_t i = 0; i < arraysize(types); ++i) { |
1751 Browser::CreateParams params(types[i], browser()->profile(), | 1750 Browser::CreateParams params(types[i], browser()->profile()); |
1752 browser()->host_desktop_type()); | |
1753 params.initial_show_state = ui::SHOW_STATE_MINIMIZED; | 1751 params.initial_show_state = ui::SHOW_STATE_MINIMIZED; |
1754 AddBlankTabAndShow(new Browser(params)); | 1752 AddBlankTabAndShow(new Browser(params)); |
1755 } | 1753 } |
1756 } | 1754 } |
1757 | 1755 |
1758 // Makes sure the forward button is disabled immediately when navigating | 1756 // Makes sure the forward button is disabled immediately when navigating |
1759 // forward to a slow-to-commit page. | 1757 // forward to a slow-to-commit page. |
1760 IN_PROC_BROWSER_TEST_F(BrowserTest, ForwardDisabledOnForward) { | 1758 IN_PROC_BROWSER_TEST_F(BrowserTest, ForwardDisabledOnForward) { |
1761 GURL blank_url(url::kAboutBlankURL); | 1759 GURL blank_url(url::kAboutBlankURL); |
1762 ui_test_utils::NavigateToURL(browser(), blank_url); | 1760 ui_test_utils::NavigateToURL(browser(), blank_url); |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1807 // Bookmarks & Settings commands should get disabled. | 1805 // Bookmarks & Settings commands should get disabled. |
1808 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); | 1806 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); |
1809 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); | 1807 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); |
1810 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1808 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1811 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); | 1809 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); |
1812 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1810 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1813 // New Incognito Window command, however, should be enabled. | 1811 // New Incognito Window command, however, should be enabled. |
1814 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); | 1812 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); |
1815 | 1813 |
1816 // Create a new browser. | 1814 // Create a new browser. |
1817 Browser* new_browser = | 1815 Browser* new_browser = new Browser( |
1818 new Browser(Browser::CreateParams( | 1816 Browser::CreateParams(browser()->profile()->GetOffTheRecordProfile())); |
1819 browser()->profile()->GetOffTheRecordProfile(), | |
1820 browser()->host_desktop_type())); | |
1821 CommandUpdater* new_command_updater = | 1817 CommandUpdater* new_command_updater = |
1822 new_browser->command_controller()->command_updater(); | 1818 new_browser->command_controller()->command_updater(); |
1823 // It should have Bookmarks & Settings commands disabled by default. | 1819 // It should have Bookmarks & Settings commands disabled by default. |
1824 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); | 1820 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); |
1825 EXPECT_FALSE(new_command_updater->IsCommandEnabled( | 1821 EXPECT_FALSE(new_command_updater->IsCommandEnabled( |
1826 IDC_SHOW_BOOKMARK_MANAGER)); | 1822 IDC_SHOW_BOOKMARK_MANAGER)); |
1827 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1823 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1828 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); | 1824 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); |
1829 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1825 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1830 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); | 1826 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); |
(...skipping 12 matching lines...) Expand all Loading... |
1843 // should be enabled. | 1839 // should be enabled. |
1844 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); | 1840 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); |
1845 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); | 1841 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); |
1846 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); | 1842 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); |
1847 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1843 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1848 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); | 1844 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); |
1849 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1845 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1850 | 1846 |
1851 // Create a new browser. | 1847 // Create a new browser. |
1852 Browser* new_browser = | 1848 Browser* new_browser = |
1853 new Browser(Browser::CreateParams(browser()->profile(), | 1849 new Browser(Browser::CreateParams(browser()->profile())); |
1854 browser()->host_desktop_type())); | |
1855 CommandUpdater* new_command_updater = | 1850 CommandUpdater* new_command_updater = |
1856 new_browser->command_controller()->command_updater(); | 1851 new_browser->command_controller()->command_updater(); |
1857 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); | 1852 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); |
1858 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); | 1853 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); |
1859 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); | 1854 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); |
1860 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1855 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1861 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); | 1856 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); |
1862 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1857 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1863 } | 1858 } |
1864 | 1859 |
(...skipping 12 matching lines...) Expand all Loading... |
1877 // Make sure Manage Extensions command is disabled. | 1872 // Make sure Manage Extensions command is disabled. |
1878 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); | 1873 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); |
1879 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); | 1874 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); |
1880 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); | 1875 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); |
1881 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1876 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1882 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1877 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1883 | 1878 |
1884 // Create a popup (non-main-UI-type) browser. Settings command as well | 1879 // Create a popup (non-main-UI-type) browser. Settings command as well |
1885 // as Extensions should be disabled. | 1880 // as Extensions should be disabled. |
1886 Browser* popup_browser = new Browser( | 1881 Browser* popup_browser = new Browser( |
1887 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile(), | 1882 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile())); |
1888 browser()->host_desktop_type())); | |
1889 CommandUpdater* popup_command_updater = | 1883 CommandUpdater* popup_command_updater = |
1890 popup_browser->command_controller()->command_updater(); | 1884 popup_browser->command_controller()->command_updater(); |
1891 EXPECT_FALSE(popup_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); | 1885 EXPECT_FALSE(popup_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); |
1892 EXPECT_FALSE(popup_command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1886 EXPECT_FALSE(popup_command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1893 EXPECT_TRUE(popup_command_updater->IsCommandEnabled( | 1887 EXPECT_TRUE(popup_command_updater->IsCommandEnabled( |
1894 IDC_SHOW_BOOKMARK_MANAGER)); | 1888 IDC_SHOW_BOOKMARK_MANAGER)); |
1895 EXPECT_FALSE(popup_command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1889 EXPECT_FALSE(popup_command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1896 } | 1890 } |
1897 | 1891 |
1898 // Makes sure Extensions and Settings commands are disabled in certain | 1892 // Makes sure Extensions and Settings commands are disabled in certain |
1899 // circumstances even though normally they should stay enabled. | 1893 // circumstances even though normally they should stay enabled. |
1900 IN_PROC_BROWSER_TEST_F(BrowserTest, | 1894 IN_PROC_BROWSER_TEST_F(BrowserTest, |
1901 DisableOptionsAndImportMenuItemsConsistently) { | 1895 DisableOptionsAndImportMenuItemsConsistently) { |
1902 // Create a popup browser. | 1896 // Create a popup browser. |
1903 Browser* popup_browser = new Browser( | 1897 Browser* popup_browser = new Browser( |
1904 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile(), | 1898 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile())); |
1905 browser()->host_desktop_type())); | |
1906 CommandUpdater* command_updater = | 1899 CommandUpdater* command_updater = |
1907 popup_browser->command_controller()->command_updater(); | 1900 popup_browser->command_controller()->command_updater(); |
1908 // OPTIONS and IMPORT_SETTINGS are disabled for a non-normal UI. | 1901 // OPTIONS and IMPORT_SETTINGS are disabled for a non-normal UI. |
1909 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1902 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1910 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1903 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1911 | 1904 |
1912 // Set Incognito to FORCED. | 1905 // Set Incognito to FORCED. |
1913 IncognitoModePrefs::SetAvailability(popup_browser->profile()->GetPrefs(), | 1906 IncognitoModePrefs::SetAvailability(popup_browser->profile()->GetPrefs(), |
1914 IncognitoModePrefs::FORCED); | 1907 IncognitoModePrefs::FORCED); |
1915 // OPTIONS and IMPORT_SETTINGS are disabled when Incognito is forced. | 1908 // OPTIONS and IMPORT_SETTINGS are disabled when Incognito is forced. |
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2380 Profile* profile = browser()->profile(); | 2373 Profile* profile = browser()->profile(); |
2381 EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); | 2374 EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); |
2382 content::WindowedNotificationObserver observer( | 2375 content::WindowedNotificationObserver observer( |
2383 chrome::NOTIFICATION_BROWSER_CLOSED, | 2376 chrome::NOTIFICATION_BROWSER_CLOSED, |
2384 content::Source<Browser>(browser())); | 2377 content::Source<Browser>(browser())); |
2385 chrome::CloseWindow(browser()); | 2378 chrome::CloseWindow(browser()); |
2386 observer.Wait(); | 2379 observer.Wait(); |
2387 EXPECT_EQ(0u, chrome::GetTotalBrowserCount()); | 2380 EXPECT_EQ(0u, chrome::GetTotalBrowserCount()); |
2388 | 2381 |
2389 ui_test_utils::BrowserAddedObserver browser_added_observer; | 2382 ui_test_utils::BrowserAddedObserver browser_added_observer; |
2390 chrome::NewEmptyWindow(profile, chrome::GetActiveDesktop()); | 2383 chrome::NewEmptyWindow(profile); |
2391 browser_added_observer.WaitForSingleNewBrowser(); | 2384 browser_added_observer.WaitForSingleNewBrowser(); |
2392 | 2385 |
2393 EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); | 2386 EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); |
2394 } | 2387 } |
2395 | 2388 |
2396 // Tests to ensure that the browser continues running in the background after | 2389 // Tests to ensure that the browser continues running in the background after |
2397 // the last window closes. | 2390 // the last window closes. |
2398 class NoStartupWindowTest : public BrowserTest { | 2391 class NoStartupWindowTest : public BrowserTest { |
2399 public: | 2392 public: |
2400 NoStartupWindowTest() {} | 2393 NoStartupWindowTest() {} |
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3222 IN_PROC_BROWSER_TEST_F(BrowserTest, TestPopupBounds) { | 3215 IN_PROC_BROWSER_TEST_F(BrowserTest, TestPopupBounds) { |
3223 { | 3216 { |
3224 // Minimum size that a popup window should have appended to its height when | 3217 // Minimum size that a popup window should have appended to its height when |
3225 // drawn (popup window bounds are for the content, not the window). This is | 3218 // drawn (popup window bounds are for the content, not the window). This is |
3226 // the size of the toolbar on views platforms. | 3219 // the size of the toolbar on views platforms. |
3227 const int minimum_popup_padding = 29; | 3220 const int minimum_popup_padding = 29; |
3228 | 3221 |
3229 // Creates an untrusted popup window and asserts that the eventual height is | 3222 // Creates an untrusted popup window and asserts that the eventual height is |
3230 // padded with the toolbar and title bar height (initial height is content | 3223 // padded with the toolbar and title bar height (initial height is content |
3231 // height). | 3224 // height). |
3232 Browser::CreateParams params(Browser::TYPE_POPUP, browser()->profile(), | 3225 Browser::CreateParams params(Browser::TYPE_POPUP, browser()->profile()); |
3233 chrome::HOST_DESKTOP_TYPE_NATIVE); | |
3234 params.initial_bounds = gfx::Rect(0, 0, 100, 122); | 3226 params.initial_bounds = gfx::Rect(0, 0, 100, 122); |
3235 Browser* browser = new Browser(params); | 3227 Browser* browser = new Browser(params); |
3236 gfx::Rect bounds = browser->window()->GetBounds(); | 3228 gfx::Rect bounds = browser->window()->GetBounds(); |
3237 | 3229 |
3238 // Should be EXPECT_EQ, but this width is inconsistent across platforms. | 3230 // Should be EXPECT_EQ, but this width is inconsistent across platforms. |
3239 // See https://crbug.com/567925. | 3231 // See https://crbug.com/567925. |
3240 EXPECT_GE(bounds.width(), 100); | 3232 EXPECT_GE(bounds.width(), 100); |
3241 | 3233 |
3242 // EXPECT_GE as Mac will have a larger height with the additional title bar. | 3234 // EXPECT_GE as Mac will have a larger height with the additional title bar. |
3243 EXPECT_GE(bounds.height(), 122 + minimum_popup_padding); | 3235 EXPECT_GE(bounds.height(), 122 + minimum_popup_padding); |
3244 browser->window()->Close(); | 3236 browser->window()->Close(); |
3245 } | 3237 } |
3246 | 3238 |
3247 { | 3239 { |
3248 // Creates a trusted popup window and asserts that the eventual height | 3240 // Creates a trusted popup window and asserts that the eventual height |
3249 // doesn't change (initial height is window height). | 3241 // doesn't change (initial height is window height). |
3250 Browser::CreateParams params(Browser::TYPE_POPUP, browser()->profile(), | 3242 Browser::CreateParams params(Browser::TYPE_POPUP, browser()->profile()); |
3251 chrome::HOST_DESKTOP_TYPE_NATIVE); | |
3252 params.initial_bounds = gfx::Rect(0, 0, 100, 122); | 3243 params.initial_bounds = gfx::Rect(0, 0, 100, 122); |
3253 params.trusted_source = true; | 3244 params.trusted_source = true; |
3254 Browser* browser = new Browser(params); | 3245 Browser* browser = new Browser(params); |
3255 gfx::Rect bounds = browser->window()->GetBounds(); | 3246 gfx::Rect bounds = browser->window()->GetBounds(); |
3256 | 3247 |
3257 // Should be EXPECT_EQ, but this width is inconsistent across platforms. | 3248 // Should be EXPECT_EQ, but this width is inconsistent across platforms. |
3258 // See https://crbug.com/567925. | 3249 // See https://crbug.com/567925. |
3259 EXPECT_GE(bounds.width(), 100); | 3250 EXPECT_GE(bounds.width(), 100); |
3260 EXPECT_EQ(122, bounds.height()); | 3251 EXPECT_EQ(122, bounds.height()); |
3261 browser->window()->Close(); | 3252 browser->window()->Close(); |
3262 } | 3253 } |
3263 | 3254 |
3264 { | 3255 { |
3265 // Creates an untrusted app window and asserts that the eventual height | 3256 // Creates an untrusted app window and asserts that the eventual height |
3266 // doesn't change. | 3257 // doesn't change. |
3267 Browser::CreateParams params = Browser::CreateParams::CreateForApp( | 3258 Browser::CreateParams params = Browser::CreateParams::CreateForApp( |
3268 "app-name", false, gfx::Rect(0, 0, 100, 122), browser()->profile(), | 3259 "app-name", false, gfx::Rect(0, 0, 100, 122), browser()->profile()); |
3269 chrome::HOST_DESKTOP_TYPE_NATIVE); | |
3270 Browser* browser = new Browser(params); | 3260 Browser* browser = new Browser(params); |
3271 gfx::Rect bounds = browser->window()->GetBounds(); | 3261 gfx::Rect bounds = browser->window()->GetBounds(); |
3272 | 3262 |
3273 // Should be EXPECT_EQ, but this width is inconsistent across platforms. | 3263 // Should be EXPECT_EQ, but this width is inconsistent across platforms. |
3274 // See https://crbug.com/567925. | 3264 // See https://crbug.com/567925. |
3275 EXPECT_GE(bounds.width(), 100); | 3265 EXPECT_GE(bounds.width(), 100); |
3276 EXPECT_EQ(122, bounds.height()); | 3266 EXPECT_EQ(122, bounds.height()); |
3277 browser->window()->Close(); | 3267 browser->window()->Close(); |
3278 } | 3268 } |
3279 | 3269 |
3280 { | 3270 { |
3281 // Creates a trusted app window and asserts that the eventual height | 3271 // Creates a trusted app window and asserts that the eventual height |
3282 // doesn't change. | 3272 // doesn't change. |
3283 Browser::CreateParams params = Browser::CreateParams::CreateForApp( | 3273 Browser::CreateParams params = Browser::CreateParams::CreateForApp( |
3284 "app-name", true, gfx::Rect(0, 0, 100, 122), browser()->profile(), | 3274 "app-name", true, gfx::Rect(0, 0, 100, 122), browser()->profile()); |
3285 chrome::HOST_DESKTOP_TYPE_NATIVE); | |
3286 Browser* browser = new Browser(params); | 3275 Browser* browser = new Browser(params); |
3287 gfx::Rect bounds = browser->window()->GetBounds(); | 3276 gfx::Rect bounds = browser->window()->GetBounds(); |
3288 | 3277 |
3289 // Should be EXPECT_EQ, but this width is inconsistent across platforms. | 3278 // Should be EXPECT_EQ, but this width is inconsistent across platforms. |
3290 // See https://crbug.com/567925. | 3279 // See https://crbug.com/567925. |
3291 EXPECT_GE(bounds.width(), 100); | 3280 EXPECT_GE(bounds.width(), 100); |
3292 EXPECT_EQ(122, bounds.height()); | 3281 EXPECT_EQ(122, bounds.height()); |
3293 browser->window()->Close(); | 3282 browser->window()->Close(); |
3294 } | 3283 } |
3295 | 3284 |
3296 { | 3285 { |
3297 // Creates a devtools window and asserts that the eventual height | 3286 // Creates a devtools window and asserts that the eventual height |
3298 // doesn't change. | 3287 // doesn't change. |
3299 Browser::CreateParams params = Browser::CreateParams::CreateForDevTools( | 3288 Browser::CreateParams params = |
3300 browser()->profile(), chrome::HOST_DESKTOP_TYPE_NATIVE); | 3289 Browser::CreateParams::CreateForDevTools(browser()->profile()); |
3301 params.initial_bounds = gfx::Rect(0, 0, 100, 122); | 3290 params.initial_bounds = gfx::Rect(0, 0, 100, 122); |
3302 Browser* browser = new Browser(params); | 3291 Browser* browser = new Browser(params); |
3303 gfx::Rect bounds = browser->window()->GetBounds(); | 3292 gfx::Rect bounds = browser->window()->GetBounds(); |
3304 | 3293 |
3305 // Should be EXPECT_EQ, but this width is inconsistent across platforms. | 3294 // Should be EXPECT_EQ, but this width is inconsistent across platforms. |
3306 // See https://crbug.com/567925. | 3295 // See https://crbug.com/567925. |
3307 EXPECT_GE(bounds.width(), 100); | 3296 EXPECT_GE(bounds.width(), 100); |
3308 EXPECT_EQ(122, bounds.height()); | 3297 EXPECT_EQ(122, bounds.height()); |
3309 browser->window()->Close(); | 3298 browser->window()->Close(); |
3310 } | 3299 } |
3311 } | 3300 } |
OLD | NEW |