OLD | NEW |
---|---|
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 <Carbon/Carbon.h> | 5 #include <Carbon/Carbon.h> |
6 | 6 |
7 #include "base/mac_util.h" | 7 #include "base/mac_util.h" |
8 #include "base/scoped_nsdisable_screen_updates.h" | 8 #include "base/scoped_nsdisable_screen_updates.h" |
9 #include "base/sys_string_conversions.h" | 9 #include "base/sys_string_conversions.h" |
10 #include "chrome/app/chrome_dll_resource.h" // IDC_* | 10 #include "chrome/app/chrome_dll_resource.h" // IDC_* |
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
664 | 664 |
665 [fullscreen_window_ close]; | 665 [fullscreen_window_ close]; |
666 fullscreen_window_.reset(nil); | 666 fullscreen_window_.reset(nil); |
667 } | 667 } |
668 } | 668 } |
669 | 669 |
670 - (BOOL)isFullscreen { | 670 - (BOOL)isFullscreen { |
671 return fullscreen_; | 671 return fullscreen_; |
672 } | 672 } |
673 | 673 |
674 - (void)executeCommand:(int)command { | |
pink (ping after 24hrs)
2009/07/08 13:48:17
do you want to re-tool commandDispatch: to go thro
| |
675 if (browser_->command_updater()->IsCommandEnabled(command)) | |
676 browser_->ExecuteCommand(command); | |
677 } | |
678 | |
674 // Called by the bookmark bar to open a URL. | 679 // Called by the bookmark bar to open a URL. |
675 - (void)openBookmarkURL:(const GURL&)url | 680 - (void)openBookmarkURL:(const GURL&)url |
676 disposition:(WindowOpenDisposition)disposition { | 681 disposition:(WindowOpenDisposition)disposition { |
677 TabContents* tab_contents = browser_->GetSelectedTabContents(); | 682 TabContents* tab_contents = browser_->GetSelectedTabContents(); |
678 DCHECK(tab_contents); | 683 DCHECK(tab_contents); |
679 tab_contents->OpenURL(url, GURL(), disposition, | 684 tab_contents->OpenURL(url, GURL(), disposition, |
680 PageTransition::AUTO_BOOKMARK); | 685 PageTransition::AUTO_BOOKMARK); |
681 } | 686 } |
682 | 687 |
683 - (NSInteger)numberOfTabs { | 688 - (NSInteger)numberOfTabs { |
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
897 browser_->ExecuteCommand(command); | 902 browser_->ExecuteCommand(command); |
898 } | 903 } |
899 | 904 |
900 - (id)windowWillReturnFieldEditor:(NSWindow*)sender toObject:(id)obj { | 905 - (id)windowWillReturnFieldEditor:(NSWindow*)sender toObject:(id)obj { |
901 // Ask the toolbar controller if it wants to return a custom field editor | 906 // Ask the toolbar controller if it wants to return a custom field editor |
902 // for the specific object. | 907 // for the specific object. |
903 return [toolbarController_ customFieldEditorForObject:obj]; | 908 return [toolbarController_ customFieldEditorForObject:obj]; |
904 } | 909 } |
905 | 910 |
906 @end | 911 @end |
OLD | NEW |