| 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 737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 748 if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED) | 748 if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED) |
| 749 return 0; | 749 return 0; |
| 750 return 40; | 750 return 40; |
| 751 } | 751 } |
| 752 | 752 |
| 753 void BrowserWindowCocoa::ExecuteExtensionCommand( | 753 void BrowserWindowCocoa::ExecuteExtensionCommand( |
| 754 const extensions::Extension* extension, | 754 const extensions::Extension* extension, |
| 755 const extensions::Command& command) { | 755 const extensions::Command& command) { |
| 756 [cocoa_controller() executeExtensionCommand:extension->id() command:command]; | 756 [cocoa_controller() executeExtensionCommand:extension->id() command:command]; |
| 757 } | 757 } |
| 758 | |
| 759 void BrowserWindowCocoa::ShowPageActionPopup( | |
| 760 const extensions::Extension* extension) { | |
| 761 [cocoa_controller() activatePageAction:extension->id()]; | |
| 762 } | |
| 763 | |
| 764 void BrowserWindowCocoa::ShowBrowserActionPopup( | |
| 765 const extensions::Extension* extension) { | |
| 766 [cocoa_controller() activateBrowserAction:extension->id()]; | |
| 767 } | |
| OLD | NEW |