From 69bddd03590e72de85854512d605cbaae86ef585 Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Tue, 10 Feb 2009 18:51:58 +0000 Subject: Hook views up. Review URL: http://codereview.chromium.org/21212 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9487 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/cocoa/tab_contents_controller.h | 1 + chrome/browser/cocoa/tab_contents_controller.mm | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'chrome/browser/cocoa') diff --git a/chrome/browser/cocoa/tab_contents_controller.h b/chrome/browser/cocoa/tab_contents_controller.h index d699e4f..14e52ca 100644 --- a/chrome/browser/cocoa/tab_contents_controller.h +++ b/chrome/browser/cocoa/tab_contents_controller.h @@ -34,6 +34,7 @@ class TabStripModel; IBOutlet NSButton* reloadStopButton_; IBOutlet NSButton* starButton_; IBOutlet NSTextField* locationBar_; + IBOutlet NSBox* contentsBox_; } // Create the contents of a tab represented by |contents| and loaded from the diff --git a/chrome/browser/cocoa/tab_contents_controller.mm b/chrome/browser/cocoa/tab_contents_controller.mm index 496d609..ebcb3d7 100644 --- a/chrome/browser/cocoa/tab_contents_controller.mm +++ b/chrome/browser/cocoa/tab_contents_controller.mm @@ -8,6 +8,9 @@ #import "chrome/browser/command_updater.h" #import "chrome/browser/location_bar.h" +// For now, tab_contents lives here. TODO(port):fix +#include "chrome/common/temp_scaffolding_stubs.h" + @interface TabContentsController(CommandUpdates) - (void)enabledStateChangedForCommand:(NSInteger)command enabled:(BOOL)enabled; @end @@ -64,6 +67,7 @@ class LocationBarBridge : public LocationBar { if (commands_) observer_ = new TabContentsCommandObserver(self, commands); locationBarBridge_ = new LocationBarBridge(self); + [contentsBox_ setContentView:contents->GetNativeView()]; } return self; } -- cgit v1.1