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

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

Issue 10444050: Show no exit instruction on Mac when in Browser Fullscreen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 | Annotate | Revision Log
« 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 1967 matching lines...) Expand 10 before | Expand all | Expand 10 after
1978 1978
1979 - (void)exitFullscreen { 1979 - (void)exitFullscreen {
1980 // url: and bubbleType: are ignored when leaving fullscreen. 1980 // url: and bubbleType: are ignored when leaving fullscreen.
1981 [self setFullscreen:NO url:GURL() bubbleType:FEB_TYPE_NONE]; 1981 [self setFullscreen:NO url:GURL() bubbleType:FEB_TYPE_NONE];
1982 } 1982 }
1983 1983
1984 - (void)updateFullscreenExitBubbleURL:(const GURL&)url 1984 - (void)updateFullscreenExitBubbleURL:(const GURL&)url
1985 bubbleType:(FullscreenExitBubbleType)bubbleType { 1985 bubbleType:(FullscreenExitBubbleType)bubbleType {
1986 fullscreenUrl_ = url; 1986 fullscreenUrl_ = url;
1987 fullscreenBubbleType_ = bubbleType; 1987 fullscreenBubbleType_ = bubbleType;
1988 if (bubbleType == FEB_TYPE_NONE) { 1988 if (bubbleType == FEB_TYPE_NONE ||
1989 bubbleType == FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION) {
1990 // Show no exit instruction bubble on Mac when in Browser Fullscreen.
1989 [self destroyFullscreenExitBubbleIfNecessary]; 1991 [self destroyFullscreenExitBubbleIfNecessary];
1990 } else { 1992 } else {
1991 if (!fullscreenExitBubbleController_.get()) { 1993 if (!fullscreenExitBubbleController_.get()) {
1992 [self showFullscreenExitBubbleIfNecessary]; 1994 [self showFullscreenExitBubbleIfNecessary];
1993 } 1995 }
1994 [fullscreenExitBubbleController_.get() updateURL:url bubbleType:bubbleType]; 1996 [fullscreenExitBubbleController_.get() updateURL:url bubbleType:bubbleType];
1995 } 1997 }
1996 } 1998 }
1997 1999
1998 - (BOOL)isFullscreen { 2000 - (BOOL)isFullscreen {
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
2218 2220
2219 - (BOOL)supportsBookmarkBar { 2221 - (BOOL)supportsBookmarkBar {
2220 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2222 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2221 } 2223 }
2222 2224
2223 - (BOOL)isTabbedWindow { 2225 - (BOOL)isTabbedWindow {
2224 return browser_->is_type_tabbed(); 2226 return browser_->is_type_tabbed();
2225 } 2227 }
2226 2228
2227 @end // @implementation BrowserWindowController(WindowType) 2229 @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