Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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.h" | 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 #include <numeric> | 8 #include <numeric> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1974 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1985 [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]]; | 1985 [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]]; |
| 1986 [self updateContentOffsets]; | 1986 [self updateContentOffsets]; |
| 1987 [self updateSubviewZOrder:[self inPresentationMode]]; | 1987 [self updateSubviewZOrder:[self inPresentationMode]]; |
| 1988 [self updateInfoBarTipVisibility]; | 1988 [self updateInfoBarTipVisibility]; |
| 1989 } | 1989 } |
| 1990 | 1990 |
| 1991 - (void)onFindBarVisibilityChanged { | 1991 - (void)onFindBarVisibilityChanged { |
| 1992 [self updateAllowOverlappingViews:[self inPresentationMode]]; | 1992 [self updateAllowOverlappingViews:[self inPresentationMode]]; |
| 1993 } | 1993 } |
| 1994 | 1994 |
| 1995 - (void)onHistoryOverlayShown { | |
| 1996 ++historyOverlayCount_; | |
|
Robert Sesek
2013/06/10 20:30:35
Why do we need to count them?
sail
2013/06/10 20:56:01
The window controller instance is referenced by mu
Robert Sesek
2013/06/10 20:59:28
I guess it depends on what the invariant is. It se
sail
2013/06/10 22:21:07
I verified that the count can be greater than 1. F
| |
| 1997 [self updateAllowOverlappingViews:[self inPresentationMode]]; | |
| 1998 } | |
| 1999 | |
| 2000 - (void)onHistoryOverlayHidden { | |
| 2001 --historyOverlayCount_; | |
| 2002 [self updateAllowOverlappingViews:[self inPresentationMode]]; | |
| 2003 } | |
| 2004 | |
| 1995 @end // @implementation BrowserWindowController | 2005 @end // @implementation BrowserWindowController |
| 1996 | 2006 |
| 1997 | 2007 |
| 1998 @implementation BrowserWindowController(Fullscreen) | 2008 @implementation BrowserWindowController(Fullscreen) |
| 1999 | 2009 |
| 2000 - (void)handleLionToggleFullscreen { | 2010 - (void)handleLionToggleFullscreen { |
| 2001 DCHECK(base::mac::IsOSLionOrLater()); | 2011 DCHECK(base::mac::IsOSLionOrLater()); |
| 2002 chrome::ExecuteCommand(browser_.get(), IDC_FULLSCREEN); | 2012 chrome::ExecuteCommand(browser_.get(), IDC_FULLSCREEN); |
| 2003 } | 2013 } |
| 2004 | 2014 |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2246 | 2256 |
| 2247 - (BOOL)supportsBookmarkBar { | 2257 - (BOOL)supportsBookmarkBar { |
| 2248 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; | 2258 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; |
| 2249 } | 2259 } |
| 2250 | 2260 |
| 2251 - (BOOL)isTabbedWindow { | 2261 - (BOOL)isTabbedWindow { |
| 2252 return browser_->is_type_tabbed(); | 2262 return browser_->is_type_tabbed(); |
| 2253 } | 2263 } |
| 2254 | 2264 |
| 2255 @end // @implementation BrowserWindowController(WindowType) | 2265 @end // @implementation BrowserWindowController(WindowType) |
| OLD | NEW |