OLD | NEW |
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/presentation_mode_controller.h" | 5 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #import "base/mac/mac_util.h" | 10 #import "base/mac/mac_util.h" |
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
327 [browserController_ lockBarVisibilityForOwner:self | 327 [browserController_ lockBarVisibilityForOwner:self |
328 withAnimation:NO | 328 withAnimation:NO |
329 delay:NO]; | 329 delay:NO]; |
330 [self setupTrackingArea]; | 330 [self setupTrackingArea]; |
331 } | 331 } |
332 | 332 |
333 - (void)ensureOverlayShownWithAnimation:(BOOL)animate delay:(BOOL)delay { | 333 - (void)ensureOverlayShownWithAnimation:(BOOL)animate delay:(BOOL)delay { |
334 if (!inPresentationMode_) | 334 if (!inPresentationMode_) |
335 return; | 335 return; |
336 | 336 |
337 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) | 337 if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) |
338 return; | 338 return; |
339 | 339 |
340 if (self.slidingStyle == fullscreen_mac::OMNIBOX_TABS_PRESENT) | 340 if (self.slidingStyle == fullscreen_mac::OMNIBOX_TABS_PRESENT) |
341 return; | 341 return; |
342 | 342 |
343 if (animate) { | 343 if (animate) { |
344 if (delay) { | 344 if (delay) { |
345 [self startShowTimer]; | 345 [self startShowTimer]; |
346 } else { | 346 } else { |
347 [self cancelAllTimers]; | 347 [self cancelAllTimers]; |
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
742 [self updateMenuBarAndDockVisibility]; | 742 [self updateMenuBarAndDockVisibility]; |
743 | 743 |
744 // TODO(rohitrao): Remove the Exit Fullscreen button. http://crbug.com/35956 | 744 // TODO(rohitrao): Remove the Exit Fullscreen button. http://crbug.com/35956 |
745 } | 745 } |
746 | 746 |
747 - (BOOL)shouldShowMenubarInImmersiveFullscreen { | 747 - (BOOL)shouldShowMenubarInImmersiveFullscreen { |
748 return [self doesScreenHaveMenuBar] && toolbarFraction_ > 0.99; | 748 return [self doesScreenHaveMenuBar] && toolbarFraction_ > 0.99; |
749 } | 749 } |
750 | 750 |
751 @end | 751 @end |
OLD | NEW |