diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-23 02:53:48 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-23 02:53:48 +0000 |
commit | 849184e76e1ab42cc35d0ef2a2213a6017e3b9cb (patch) | |
tree | db5be7f3d7283bb0852a233a085f4c92a3f175c7 | |
parent | c63c75231ad881b432d4a6c0ba799ba82d0135e2 (diff) | |
download | chromium_src-849184e76e1ab42cc35d0ef2a2213a6017e3b9cb.zip chromium_src-849184e76e1ab42cc35d0ef2a2213a6017e3b9cb.tar.gz chromium_src-849184e76e1ab42cc35d0ef2a2213a6017e3b9cb.tar.bz2 |
Merge 45407 - Attempt to fix Mac build
BUG=41466
TEST=none
TBR=pkasting@chromium.org
Review URL: http://codereview.chromium.org/1732009
git-svn-id: svn://svn.chromium.org/chrome/branches/375/src@45411 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/cocoa/toolbar_controller_unittest.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/toolbar_controller_unittest.mm b/chrome/browser/cocoa/toolbar_controller_unittest.mm index dab5cba..7c718c4 100644 --- a/chrome/browser/cocoa/toolbar_controller_unittest.mm +++ b/chrome/browser/cocoa/toolbar_controller_unittest.mm @@ -135,7 +135,7 @@ TEST_F(ToolbarControllerTest, FocusLocation) { NSWindow* window = test_window(); [window makeFirstResponder:[window contentView]]; EXPECT_EQ([window firstResponder], [window contentView]); - [bar_ focusLocationBar]; + [bar_ focusLocationBar:YES]; EXPECT_NE([window firstResponder], [window contentView]); NSView* locationBar = [[bar_ toolbarViews] objectAtIndex:kLocationIndex]; EXPECT_EQ([window firstResponder], [(id)locationBar currentEditor]); |