diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-20 13:19:57 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-20 13:19:57 +0000 |
| commit | 02f49d56563b5a9b49463e6818cb6c79b858e5c3 (patch) | |
| tree | a97cbe13fb804dc4a786810c3ad5d09d663664eb | |
| parent | bed76fded2fb471c26e6f78c6709fb3c3e5a04a3 (diff) | |
| download | chromium_src-02f49d56563b5a9b49463e6818cb6c79b858e5c3.zip chromium_src-02f49d56563b5a9b49463e6818cb6c79b858e5c3.tar.gz chromium_src-02f49d56563b5a9b49463e6818cb6c79b858e5c3.tar.bz2 | |
When loading, change the tag on the "go button" to IDC_STOP so it executes the correct command. Update the unit test to verify. BUG=12260 TEST=click stop button while loading page.
Review URL: http://codereview.chromium.org/115540
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16478 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/cocoa/toolbar_controller.mm | 6 | ||||
| -rw-r--r-- | chrome/browser/cocoa/toolbar_controller_unittest.mm | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm index 46cc1e0..74f319f 100644 --- a/chrome/browser/cocoa/toolbar_controller.mm +++ b/chrome/browser/cocoa/toolbar_controller.mm @@ -112,9 +112,13 @@ static NSString* const kStarredImageName = @"starred"; - (void)setIsLoading:(BOOL)isLoading { NSString* imageName = @"go"; - if (isLoading) + NSInteger tag = IDC_GO; + if (isLoading) { imageName = @"stop"; + tag = IDC_STOP; + } [goButton_ setImage:[NSImage imageNamed:imageName]]; + [goButton_ setTag:tag]; } // Returns an array of views in the order of the outlets above. diff --git a/chrome/browser/cocoa/toolbar_controller_unittest.mm b/chrome/browser/cocoa/toolbar_controller_unittest.mm index 646a8ea..2afc327 100644 --- a/chrome/browser/cocoa/toolbar_controller_unittest.mm +++ b/chrome/browser/cocoa/toolbar_controller_unittest.mm @@ -100,6 +100,15 @@ TEST_F(ToolbarControllerTest, Display) { TEST_F(ToolbarControllerTest, LoadingState) { // TODO(pinkerton): Same problem testing this as the starred state above. + + // In its initial state, the go button has a tag of IDC_GO. When loading, + // it should be IDC_STOP. + NSButton* go = [[bar_ toolbarViews] objectAtIndex:kGoIndex]; + EXPECT_EQ([go tag], IDC_GO); + [bar_ setIsLoading:YES]; + EXPECT_EQ([go tag], IDC_STOP); + [bar_ setIsLoading:NO]; + EXPECT_EQ([go tag], IDC_GO); } } // namespace |