summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-10 18:51:58 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-10 18:51:58 +0000
commit69bddd03590e72de85854512d605cbaae86ef585 (patch)
tree7c4d5db89e2d9a294fc8dcefbef7923785a21190 /chrome/browser/cocoa
parent399010e721e556e00b4e4150e9becba30fa0a5fd (diff)
downloadchromium_src-69bddd03590e72de85854512d605cbaae86ef585.zip
chromium_src-69bddd03590e72de85854512d605cbaae86ef585.tar.gz
chromium_src-69bddd03590e72de85854512d605cbaae86ef585.tar.bz2
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
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/tab_contents_controller.h1
-rw-r--r--chrome/browser/cocoa/tab_contents_controller.mm4
2 files changed, 5 insertions, 0 deletions
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;
}