| Index: chrome/browser/cocoa/browser_window_controller.mm
|
| ===================================================================
|
| --- chrome/browser/cocoa/browser_window_controller.mm (revision 58173)
|
| +++ chrome/browser/cocoa/browser_window_controller.mm (working copy)
|
| @@ -446,7 +446,7 @@
|
|
|
| // TODO(viettrungluu): For some reason, the above doesn't suffice.
|
| if ([self isFullscreen])
|
| - [floatingBarBackingView_ setNeedsDisplay:YES]; // Okay even if nil.
|
| + [[fullscreenController_ floatingBarBackingView] setNeedsDisplay:YES];
|
| }
|
|
|
| - (void)windowDidResignMain:(NSNotification*)notification {
|
| @@ -456,7 +456,7 @@
|
|
|
| // TODO(viettrungluu): For some reason, the above doesn't suffice.
|
| if ([self isFullscreen])
|
| - [floatingBarBackingView_ setNeedsDisplay:YES]; // Okay even if nil.
|
| + [[fullscreenController_ floatingBarBackingView] setNeedsDisplay:YES];
|
| }
|
|
|
| // Called when we are activated (when we gain focus).
|
| @@ -1268,11 +1268,6 @@
|
| [findBarCocoaController_ positionFindBarViewAtMaxY:maxY maxWidth:maxWidth];
|
| }
|
|
|
| -- (NSWindow*)createFullscreenWindow {
|
| - return [[[FullscreenWindow alloc] initForScreen:[[self window] screen]]
|
| - autorelease];
|
| -}
|
| -
|
| - (NSInteger)numberOfTabs {
|
| // count() includes pinned tabs (both live and phantom).
|
| return browser_->tabstrip_model()->count();
|
| @@ -1716,7 +1711,7 @@
|
| if (fullscreen) {
|
| DCHECK(!savedRegularWindow_);
|
| savedRegularWindow_ = [window retain];
|
| - destWindow = [self createFullscreenWindow];
|
| + destWindow = [fullscreenController_ window];
|
| } else {
|
| DCHECK(savedRegularWindow_);
|
| destWindow = [savedRegularWindow_ autorelease];
|
| @@ -1797,12 +1792,7 @@
|
| [self layoutSubviews];
|
| }
|
|
|
| -- (CGFloat)floatingBarShownFraction {
|
| - return floatingBarShownFraction_;
|
| -}
|
| -
|
| -- (void)setFloatingBarShownFraction:(CGFloat)fraction {
|
| - floatingBarShownFraction_ = fraction;
|
| +- (void)floatingBarShownFractionChanged {
|
| [self layoutSubviews];
|
| }
|
|
|
|
|