diff options
author | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-07 04:49:14 +0000 |
---|---|---|
committer | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-07 04:49:14 +0000 |
commit | 7b0ec59003697f626184af266d670b014c5715d5 (patch) | |
tree | 1c4864c9268e1cec9c7c83d328db3bb323fb92c9 /chrome/browser/cocoa/download_shelf_mac_unittest.mm | |
parent | c1d10a389f07e7cf1274cb4c053e5cee0bda095a (diff) | |
download | chromium_src-7b0ec59003697f626184af266d670b014c5715d5.zip chromium_src-7b0ec59003697f626184af266d670b014c5715d5.tar.gz chromium_src-7b0ec59003697f626184af266d670b014c5715d5.tar.bz2 |
Reverts the revert of 22517.
Rewrites the Mac view resizing logic to have the BrowserWindowController
directly resize and relayout its children views. Now when a view needs
to be resized, it asks its resize delegate (typically its controller's
parent) to perform the resize.
BUG=http://crbug.com/17619
TEST=Make sure that views are laid out correctly, even when they change size.
Open and close the bookmark bar. Trigger an infobar and then close it. Trigger
the download shelf and then close it. Trigger a download shelf with the infobar
open, or with the bookmark bar open. Switch to and from fullscreen with various
bars open. Resize the browser window with various bars open. Start the browser
with and without the bookmark bar open. Try all of the above in a popup window.
Review URL: http://codereview.chromium.org/165014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/download_shelf_mac_unittest.mm')
-rw-r--r-- | chrome/browser/cocoa/download_shelf_mac_unittest.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/download_shelf_mac_unittest.mm b/chrome/browser/cocoa/download_shelf_mac_unittest.mm index 78ff52d..1df20e3 100644 --- a/chrome/browser/cocoa/download_shelf_mac_unittest.mm +++ b/chrome/browser/cocoa/download_shelf_mac_unittest.mm @@ -57,19 +57,19 @@ class DownloadShelfMacTest : public testing::Test { BrowserTestHelper browser_helper_; }; -TEST_F(DownloadShelfMacTest, CreationCallsShow) { +TEST_F(DownloadShelfMacTest, CreationDoesNotCallShow) { // Also make sure the DownloadShelfMacTest constructor doesn't crash. DownloadShelfMac shelf(browser_helper_.browser(), (DownloadShelfController*)shelf_controller_.get()); - EXPECT_EQ(1, shelf_controller_.get()->callCountShow); + EXPECT_EQ(0, shelf_controller_.get()->callCountShow); } TEST_F(DownloadShelfMacTest, ForwardsShow) { DownloadShelfMac shelf(browser_helper_.browser(), (DownloadShelfController*)shelf_controller_.get()); - EXPECT_EQ(1, shelf_controller_.get()->callCountShow); + EXPECT_EQ(0, shelf_controller_.get()->callCountShow); shelf.Show(); - EXPECT_EQ(2, shelf_controller_.get()->callCountShow); + EXPECT_EQ(1, shelf_controller_.get()->callCountShow); } TEST_F(DownloadShelfMacTest, ForwardsHide) { |