Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1213)

Unified Diff: chrome/browser/cocoa/toolbar_controller.mm

Issue 155358: More bookmark bar changes.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/cocoa/toolbar_controller.h ('k') | chrome/browser/cocoa/toolbar_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/toolbar_controller.mm
===================================================================
--- chrome/browser/cocoa/toolbar_controller.mm (revision 20588)
+++ chrome/browser/cocoa/toolbar_controller.mm (working copy)
@@ -120,9 +120,15 @@
// Create a sub-controller for the bookmark bar.
bookmarkBarController_.reset([[BookmarkBarController alloc]
initWithProfile:profile_
- view:bookmarkBarView_
+ parentView:[self view]
webContentView:webContentView_
delegate:bookmarkBarDelegate_]);
+
+ // Add bookmark bar to the view hierarchy. This also triggers the
+ // nib load. The bookmark bar is defined (in the nib) to be
+ // bottom-aligned to it's parent view (among other things), so
+ // position and resize properties don't need to be set.
+ [[self view] addSubview:[bookmarkBarController_ view]];
}
- (LocationBar*)locationBar {
@@ -223,7 +229,7 @@
- (NSArray*)toolbarViews {
return [NSArray arrayWithObjects:backButton_, forwardButton_, reloadButton_,
homeButton_, starButton_, goButton_, pageButton_, wrenchButton_,
- locationBar_, bookmarkBarView_, nil];
+ locationBar_, nil];
}
// Moves |rect| to the right by |delta|, keeping the right side fixed by
« no previous file with comments | « chrome/browser/cocoa/toolbar_controller.h ('k') | chrome/browser/cocoa/toolbar_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698