| 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 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" | 5 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #import "base/mac/sdk_forward_declarations.h" | 10 #import "base/mac/sdk_forward_declarations.h" |
| (...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 399 else if (!url.is_empty()) | 399 else if (!url.is_empty()) |
| 400 [controller_ enterExtensionFullscreenForURL:url bubbleType:bubble_type]; | 400 [controller_ enterExtensionFullscreenForURL:url bubbleType:bubble_type]; |
| 401 else | 401 else |
| 402 [controller_ enterBrowserFullscreenWithToolbar:with_toolbar]; | 402 [controller_ enterBrowserFullscreenWithToolbar:with_toolbar]; |
| 403 } | 403 } |
| 404 | 404 |
| 405 void BrowserWindowCocoa::ExitFullscreen() { | 405 void BrowserWindowCocoa::ExitFullscreen() { |
| 406 [controller_ exitAnyFullscreen]; | 406 [controller_ exitAnyFullscreen]; |
| 407 } | 407 } |
| 408 | 408 |
| 409 void BrowserWindowCocoa::UpdateFullscreenExitBubbleContent( | 409 void BrowserWindowCocoa::UpdateExclusiveAccessExitBubbleContent( |
| 410 const GURL& url, | 410 const GURL& url, |
| 411 ExclusiveAccessBubbleType bubble_type) { | 411 ExclusiveAccessBubbleType bubble_type) { |
| 412 [controller_ updateFullscreenExitBubbleURL:url bubbleType:bubble_type]; | 412 [controller_ updateFullscreenExitBubbleURL:url bubbleType:bubble_type]; |
| 413 } | 413 } |
| 414 | 414 |
| 415 bool BrowserWindowCocoa::ShouldHideUIForFullscreen() const { | 415 bool BrowserWindowCocoa::ShouldHideUIForFullscreen() const { |
| 416 // On Mac, fullscreen mode has most normal things (in a slide-down panel). | 416 // On Mac, fullscreen mode has most normal things (in a slide-down panel). |
| 417 return false; | 417 return false; |
| 418 } | 418 } |
| 419 | 419 |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 813 if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED) | 813 if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED) |
| 814 return 0; | 814 return 0; |
| 815 return 40; | 815 return 40; |
| 816 } | 816 } |
| 817 | 817 |
| 818 void BrowserWindowCocoa::ExecuteExtensionCommand( | 818 void BrowserWindowCocoa::ExecuteExtensionCommand( |
| 819 const extensions::Extension* extension, | 819 const extensions::Extension* extension, |
| 820 const extensions::Command& command) { | 820 const extensions::Command& command) { |
| 821 [cocoa_controller() executeExtensionCommand:extension->id() command:command]; | 821 [cocoa_controller() executeExtensionCommand:extension->id() command:command]; |
| 822 } | 822 } |
| OLD | NEW |