| 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/applescript/window_applescript.h" | 5 #import "chrome/browser/ui/cocoa/applescript/window_applescript.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #import "base/mac/scoped_nsobject.h" | 8 #import "base/mac/scoped_nsobject.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 - (NSNumber*)presenting { | 255 - (NSNumber*)presenting { |
| 256 BOOL presentingValue = browser_->window() && | 256 BOOL presentingValue = browser_->window() && |
| 257 browser_->window()->IsFullscreen() && | 257 browser_->window()->IsFullscreen() && |
| 258 !browser_->window()->IsFullscreenWithToolbar(); | 258 !browser_->window()->IsFullscreenWithToolbar(); |
| 259 return [NSNumber numberWithBool:presentingValue]; | 259 return [NSNumber numberWithBool:presentingValue]; |
| 260 } | 260 } |
| 261 | 261 |
| 262 - (void)handlesEnterPresentationMode:(NSScriptCommand*)command { | 262 - (void)handlesEnterPresentationMode:(NSScriptCommand*)command { |
| 263 if (browser_->window()) { | 263 if (browser_->window()) { |
| 264 browser_->window()->EnterFullscreen( | 264 browser_->window()->EnterFullscreen( |
| 265 GURL(), FEB_TYPE_FULLSCREEN_EXIT_INSTRUCTION, false); | 265 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION, |
| 266 false); |
| 266 } | 267 } |
| 267 } | 268 } |
| 268 | 269 |
| 269 - (void)handlesExitPresentationMode:(NSScriptCommand*)command { | 270 - (void)handlesExitPresentationMode:(NSScriptCommand*)command { |
| 270 if (browser_->window()) | 271 if (browser_->window()) |
| 271 browser_->window()->ExitFullscreen(); | 272 browser_->window()->ExitFullscreen(); |
| 272 } | 273 } |
| 273 | 274 |
| 274 @end | 275 @end |
| OLD | NEW |