| 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 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url, | 529 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url, |
| 530 bool already_bookmarked) { | 530 bool already_bookmarked) { |
| 531 [controller_ showBookmarkBubbleForURL:url | 531 [controller_ showBookmarkBubbleForURL:url |
| 532 alreadyBookmarked:(already_bookmarked ? YES : NO)]; | 532 alreadyBookmarked:(already_bookmarked ? YES : NO)]; |
| 533 } | 533 } |
| 534 | 534 |
| 535 void BrowserWindowCocoa::ShowBookmarkAppBubble( | 535 void BrowserWindowCocoa::ShowBookmarkAppBubble( |
| 536 const WebApplicationInfo& web_app_info, | 536 const WebApplicationInfo& web_app_info, |
| 537 const ShowBookmarkAppBubbleCallback& callback) { | 537 const ShowBookmarkAppBubbleCallback& callback) { |
| 538 base::scoped_nsobject<NSAlert> alert([[NSAlert alloc] init]); | 538 base::scoped_nsobject<NSAlert> alert([[NSAlert alloc] init]); |
| 539 [alert setMessageText:l10n_util::GetNSString(IDS_BOOKMARK_APP_BUBBLE_TITLE)]; | 539 [alert setMessageText:l10n_util::GetNSString( |
| 540 IDS_ADD_TO_APPLICATIONS_BUBBLE_TITLE)]; |
| 540 [alert setAlertStyle:NSInformationalAlertStyle]; | 541 [alert setAlertStyle:NSInformationalAlertStyle]; |
| 541 | 542 |
| 542 NSButton* continue_button = | 543 NSButton* continue_button = |
| 543 [alert addButtonWithTitle:l10n_util::GetNSString(IDS_OK)]; | 544 [alert addButtonWithTitle:l10n_util::GetNSString(IDS_OK)]; |
| 544 [continue_button setKeyEquivalent:kKeyEquivalentReturn]; | 545 [continue_button setKeyEquivalent:kKeyEquivalentReturn]; |
| 545 NSButton* cancel_button = | 546 NSButton* cancel_button = |
| 546 [alert addButtonWithTitle:l10n_util::GetNSString(IDS_CANCEL)]; | 547 [alert addButtonWithTitle:l10n_util::GetNSString(IDS_CANCEL)]; |
| 547 [cancel_button setKeyEquivalent:kKeyEquivalentEscape]; | 548 [cancel_button setKeyEquivalent:kKeyEquivalentEscape]; |
| 548 | 549 |
| 549 base::scoped_nsobject<NSButton> open_as_window_checkbox( | 550 base::scoped_nsobject<NSButton> open_as_window_checkbox( |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 812 if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED) | 813 if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED) |
| 813 return 0; | 814 return 0; |
| 814 return 40; | 815 return 40; |
| 815 } | 816 } |
| 816 | 817 |
| 817 void BrowserWindowCocoa::ExecuteExtensionCommand( | 818 void BrowserWindowCocoa::ExecuteExtensionCommand( |
| 818 const extensions::Extension* extension, | 819 const extensions::Extension* extension, |
| 819 const extensions::Command& command) { | 820 const extensions::Command& command) { |
| 820 [cocoa_controller() executeExtensionCommand:extension->id() command:command]; | 821 [cocoa_controller() executeExtensionCommand:extension->id() command:command]; |
| 821 } | 822 } |
| OLD | NEW |