diff options
| author | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 18:22:11 +0000 |
|---|---|---|
| committer | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 18:22:11 +0000 |
| commit | 2c1dba660624ecc04ba6e5f2116694d517b34677 (patch) | |
| tree | 066024b1461ee9049c8cee947bcbccc15d172269 /chrome/browser/cocoa/browser_window_controller_private.mm | |
| parent | 209d1942f5b06d203e660c4b69417b13e8f64e96 (diff) | |
| download | chromium_src-2c1dba660624ecc04ba6e5f2116694d517b34677.zip chromium_src-2c1dba660624ecc04ba6e5f2116694d517b34677.tar.gz chromium_src-2c1dba660624ecc04ba6e5f2116694d517b34677.tar.bz2 | |
[Mac] Add the PreviewableContentsController's view into the view hierarchy.
BUG=56835
TEST=No visible changes.
Review URL: http://codereview.chromium.org/3618019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/browser_window_controller_private.mm')
| -rw-r--r-- | chrome/browser/cocoa/browser_window_controller_private.mm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller_private.mm b/chrome/browser/cocoa/browser_window_controller_private.mm index cc3e726..819dbed 100644 --- a/chrome/browser/cocoa/browser_window_controller_private.mm +++ b/chrome/browser/cocoa/browser_window_controller_private.mm @@ -14,6 +14,7 @@ #import "chrome/browser/cocoa/floating_bar_backing_view.h" #import "chrome/browser/cocoa/framed_browser_window.h" #import "chrome/browser/cocoa/fullscreen_controller.h" +#import "chrome/browser/cocoa/previewable_contents_controller.h" #import "chrome/browser/cocoa/side_tab_strip_controller.h" #import "chrome/browser/cocoa/tab_strip_controller.h" #import "chrome/browser/cocoa/tab_strip_view.h" @@ -50,13 +51,13 @@ const CGFloat kLocBarBottomInset = 1; if ([self useVerticalTabs]) factory = [SideTabStripController class]; - DCHECK([sidebarController_ view]); - DCHECK([[sidebarController_ view] window]); + DCHECK([previewableContentsController_ activeContainer]); + DCHECK([[previewableContentsController_ activeContainer] window]); tabStripController_.reset([[factory alloc] - initWithView:[self tabStripView] - switchView:[sidebarController_ view] - browser:browser_.get() - delegate:self]); + initWithView:[self tabStripView] + switchView:[previewableContentsController_ activeContainer] + browser:browser_.get() + delegate:self]); } - (void)saveWindowPositionIfNeeded { |