Commit 6fa27cff authored by avi@chromium.org's avatar avi@chromium.org

IB outlets only get filled in during awakening, not initialization. D'oh!

Review URL: http://codereview.chromium.org/20302

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9681 0039d316-1c4b-4281-b951-d872f2087c98
parent 3ff86fc8
......@@ -29,6 +29,7 @@ class TabStripModel;
CommandUpdater* commands_; // weak, may be nil
TabContentsCommandObserver* observer_; // nil if |commands_| is nil
LocationBar* locationBarBridge_;
TabContents* contents_; // weak
IBOutlet NSButton* backButton_;
IBOutlet NSButton* forwardButton_;
IBOutlet NSButton* reloadStopButton_;
......
......@@ -75,7 +75,7 @@ class LocationBarBridge : public LocationBar {
if (commands_)
observer_ = new TabContentsCommandObserver(self, commands);
locationBarBridge_ = new LocationBarBridge(self);
[contentsBox_ setContentView:contents->GetNativeView()];
contents_ = contents;
}
return self;
}
......@@ -89,6 +89,8 @@ class LocationBarBridge : public LocationBar {
}
- (void)awakeFromNib {
[contentsBox_ setContentView:contents_->GetNativeView()];
// Provide a starting point since we won't get notifications if the state
// doesn't change between tabs.
[self updateToolbarCommandStatus];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment