Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" | 5 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #import "base/memory/scoped_nsobject.h" | 10 #import "base/memory/scoped_nsobject.h" |
| (...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 836 [self deregisterForContentViewResizeNotifications]; | 836 [self deregisterForContentViewResizeNotifications]; |
| 837 } | 837 } |
| 838 | 838 |
| 839 - (void)windowWillExitFullScreen:(NSNotification*)notification { | 839 - (void)windowWillExitFullScreen:(NSNotification*)notification { |
| 840 [self registerForContentViewResizeNotifications]; | 840 [self registerForContentViewResizeNotifications]; |
| 841 [self setPresentationModeInternal:NO forceDropdown:NO]; | 841 [self setPresentationModeInternal:NO forceDropdown:NO]; |
| 842 } | 842 } |
| 843 | 843 |
| 844 - (void)windowDidExitFullScreen:(NSNotification*)notification { | 844 - (void)windowDidExitFullScreen:(NSNotification*)notification { |
| 845 [self deregisterForContentViewResizeNotifications]; | 845 [self deregisterForContentViewResizeNotifications]; |
| 846 | |
| 847 // Force a relayout to try and get the window back into a reasonable state. | |
| 848 [self layoutSubviews]; | |
|
Avi (use Gerrit)
2011/08/09 16:36:07
Your CL description says "Force a relayout in wind
rohitrao (ping after 24h)
2011/08/09 16:46:23
I am in a maze of twisty little delegate methods,
| |
| 846 } | 849 } |
| 847 | 850 |
| 848 - (void)windowDidFailToEnterFullScreen:(NSWindow*)window { | 851 - (void)windowDidFailToEnterFullScreen:(NSWindow*)window { |
| 849 [self deregisterForContentViewResizeNotifications]; | 852 [self deregisterForContentViewResizeNotifications]; |
| 850 [self setPresentationModeInternal:NO forceDropdown:NO]; | 853 [self setPresentationModeInternal:NO forceDropdown:NO]; |
| 851 } | 854 } |
| 852 | 855 |
| 853 - (void)windowDidFailToExitFullScreen:(NSWindow*)window { | 856 - (void)windowDidFailToExitFullScreen:(NSWindow*)window { |
| 854 [self deregisterForContentViewResizeNotifications]; | 857 [self deregisterForContentViewResizeNotifications]; |
| 855 } | 858 } |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 870 - (void)disableBarVisibilityUpdates { | 873 - (void)disableBarVisibilityUpdates { |
| 871 // Early escape if there's nothing to do. | 874 // Early escape if there's nothing to do. |
| 872 if (!barVisibilityUpdatesEnabled_) | 875 if (!barVisibilityUpdatesEnabled_) |
| 873 return; | 876 return; |
| 874 | 877 |
| 875 barVisibilityUpdatesEnabled_ = NO; | 878 barVisibilityUpdatesEnabled_ = NO; |
| 876 [presentationModeController_ cancelAnimationAndTimers]; | 879 [presentationModeController_ cancelAnimationAndTimers]; |
| 877 } | 880 } |
| 878 | 881 |
| 879 @end // @implementation BrowserWindowController(Private) | 882 @end // @implementation BrowserWindowController(Private) |
| OLD | NEW |