| 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 "base/mac_util.h" | 5 #include "base/mac_util.h" |
| 6 #include "base/scoped_nsdisable_screen_updates.h" | 6 #include "base/scoped_nsdisable_screen_updates.h" |
| 7 #include "base/sys_string_conversions.h" | 7 #include "base/sys_string_conversions.h" |
| 8 #include "chrome/app/chrome_dll_resource.h" // IDC_* | 8 #include "chrome/app/chrome_dll_resource.h" // IDC_* |
| 9 #include "chrome/browser/browser.h" | 9 #include "chrome/browser/browser.h" |
| 10 #include "chrome/browser/browser_list.h" | 10 #include "chrome/browser/browser_list.h" |
| (...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 759 ; // TODO(pinkerton): figure out page-up | 759 ; // TODO(pinkerton): figure out page-up |
| 760 else if ([event deltaY] < -0.5) | 760 else if ([event deltaY] < -0.5) |
| 761 ; // TODO(pinkerton): figure out page-down | 761 ; // TODO(pinkerton): figure out page-down |
| 762 | 762 |
| 763 // Ensure the command is valid first (ExecuteCommand() won't do that) and | 763 // Ensure the command is valid first (ExecuteCommand() won't do that) and |
| 764 // then make it so. | 764 // then make it so. |
| 765 if (browser_->command_updater()->IsCommandEnabled(command)) | 765 if (browser_->command_updater()->IsCommandEnabled(command)) |
| 766 browser_->ExecuteCommand(command); | 766 browser_->ExecuteCommand(command); |
| 767 } | 767 } |
| 768 | 768 |
| 769 - (id)windowWillReturnFieldEditor:(NSWindow*)sender toObject:(id)obj { |
| 770 // Ask the toolbar controller if it wants to return a custom field editor |
| 771 // for the specific object. |
| 772 return [toolbarController_ customFieldEditorForObject:obj]; |
| 773 } |
| 774 |
| 769 @end | 775 @end |
| OLD | NEW |