| 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 #include "base/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
| (...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 web_contents, start_sync_callback, email); | 516 web_contents, start_sync_callback, email); |
| 517 } | 517 } |
| 518 } | 518 } |
| 519 #endif | 519 #endif |
| 520 | 520 |
| 521 bool BrowserWindowCocoa::IsDownloadShelfVisible() const { | 521 bool BrowserWindowCocoa::IsDownloadShelfVisible() const { |
| 522 return [controller_ isDownloadShelfVisible] != NO; | 522 return [controller_ isDownloadShelfVisible] != NO; |
| 523 } | 523 } |
| 524 | 524 |
| 525 DownloadShelf* BrowserWindowCocoa::GetDownloadShelf() { | 525 DownloadShelf* BrowserWindowCocoa::GetDownloadShelf() { |
| 526 [controller_ createAndAddDownloadShelf]; |
| 526 DownloadShelfController* shelfController = [controller_ downloadShelf]; | 527 DownloadShelfController* shelfController = [controller_ downloadShelf]; |
| 527 return [shelfController bridge]; | 528 return [shelfController bridge]; |
| 528 } | 529 } |
| 529 | 530 |
| 530 // We allow closing the window here since the real quit decision on Mac is made | 531 // We allow closing the window here since the real quit decision on Mac is made |
| 531 // in [AppController quit:]. | 532 // in [AppController quit:]. |
| 532 void BrowserWindowCocoa::ConfirmBrowserCloseWithPendingDownloads( | 533 void BrowserWindowCocoa::ConfirmBrowserCloseWithPendingDownloads( |
| 533 int download_count, | 534 int download_count, |
| 534 Browser::DownloadClosePreventionType dialog_type, | 535 Browser::DownloadClosePreventionType dialog_type, |
| 535 bool app_modal, | 536 bool app_modal, |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 719 if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED) | 720 if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED) |
| 720 return 0; | 721 return 0; |
| 721 return 40; | 722 return 40; |
| 722 } | 723 } |
| 723 | 724 |
| 724 void BrowserWindowCocoa::ExecuteExtensionCommand( | 725 void BrowserWindowCocoa::ExecuteExtensionCommand( |
| 725 const extensions::Extension* extension, | 726 const extensions::Extension* extension, |
| 726 const extensions::Command& command) { | 727 const extensions::Command& command) { |
| 727 [cocoa_controller() executeExtensionCommand:extension->id() command:command]; | 728 [cocoa_controller() executeExtensionCommand:extension->id() command:command]; |
| 728 } | 729 } |
| OLD | NEW |