Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(616)

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 2240293003: [Mac] Fix for fullscreen toolbar dropdown (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include <utility> 9 #include <utility>
10 10
(...skipping 1883 matching lines...) Expand 10 before | Expand all | Expand 10 after
1894 browser_->extension_window_controller()->SetFullscreenMode(NO, GURL()); 1894 browser_->extension_window_controller()->SetFullscreenMode(NO, GURL());
1895 return YES; 1895 return YES;
1896 } 1896 }
1897 return NO; 1897 return NO;
1898 } 1898 }
1899 1899
1900 - (void)setFullscreenToolbarVisible:(BOOL)visible { 1900 - (void)setFullscreenToolbarVisible:(BOOL)visible {
1901 if (shouldShowFullscreenToolbar_ == visible) 1901 if (shouldShowFullscreenToolbar_ == visible)
1902 return; 1902 return;
1903 1903
1904 [fullscreenToolbarController_ setToolbarFraction:0.0];
1905 shouldShowFullscreenToolbar_ = visible; 1904 shouldShowFullscreenToolbar_ = visible;
1906 [self adjustUIForSlidingFullscreenStyle: 1905 [self adjustUIForSlidingFullscreenStyle:
1907 shouldShowFullscreenToolbar_ ? fullscreen_mac::OMNIBOX_TABS_PRESENT 1906 shouldShowFullscreenToolbar_ ? fullscreen_mac::OMNIBOX_TABS_PRESENT
1908 : fullscreen_mac::OMNIBOX_TABS_HIDDEN]; 1907 : fullscreen_mac::OMNIBOX_TABS_HIDDEN];
1909 } 1908 }
1910 1909
1911 - (BOOL)isInAnyFullscreenMode { 1910 - (BOOL)isInAnyFullscreenMode {
1912 return [self isInImmersiveFullscreen] || [self isInAppKitFullscreen]; 1911 return [self isInImmersiveFullscreen] || [self isInAppKitFullscreen];
1913 } 1912 }
1914 1913
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
2053 2052
2054 - (NSRect)savedRegularWindowFrame { 2053 - (NSRect)savedRegularWindowFrame {
2055 return savedRegularWindowFrame_; 2054 return savedRegularWindowFrame_;
2056 } 2055 }
2057 2056
2058 - (BOOL)isFullscreenTransitionInProgress { 2057 - (BOOL)isFullscreenTransitionInProgress {
2059 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; 2058 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_;
2060 } 2059 }
2061 2060
2062 @end // @implementation BrowserWindowController(WindowType) 2061 @end // @implementation BrowserWindowController(WindowType)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698