diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-15 20:13:57 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-15 20:13:57 +0000 |
| commit | 3b72310426b051e5c5532a770a471eaf98050ad6 (patch) | |
| tree | 4316711b380de3c1581adb584a4e8861d1dd7358 /chrome/browser | |
| parent | 9d093198aa235dc82a945d5e43d9df77ba392a2b (diff) | |
| download | chromium_src-3b72310426b051e5c5532a770a471eaf98050ad6.zip chromium_src-3b72310426b051e5c5532a770a471eaf98050ad6.tar.gz chromium_src-3b72310426b051e5c5532a770a471eaf98050ad6.tar.bz2 | |
TEST=new Chrome with bookmark folders visible in bar.
Create new window (Cmd-N). Make sure folders there!
BUG=http://crbug.com/27774
Review URL: http://codereview.chromium.org/385130
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_controller.mm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm index 3694999..2dc56df 100644 --- a/chrome/browser/cocoa/bookmark_bar_controller.mm +++ b/chrome/browser/cocoa/bookmark_bar_controller.mm @@ -184,11 +184,15 @@ const NSTimeInterval kBookmarkBarAnimationDuration = 0.12; buttons_.reset([[NSMutableArray alloc] init]); delegate_ = delegate; resizeDelegate_ = resizeDelegate; - [[self animatableView] setResizeDelegate:resizeDelegate]; ResourceBundle& rb = ResourceBundle::GetSharedInstance(); folderImage_.reset([rb.GetNSImageNamed(IDR_BOOKMARK_BAR_FOLDER) retain]); defaultImage_.reset([rb.GetNSImageNamed(IDR_DEFAULT_FAVICON) retain]); + + // This call triggers an awakeFromNib, which builds the bar, which + // might uses folderImage_. So make sure it happens after + // folderImage_ is loaded. + [[self animatableView] setResizeDelegate:resizeDelegate]; } return self; } |