| 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 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_ |
| 6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_ | 6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_ |
| 7 | 7 |
| 8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
| 9 | 9 |
| 10 #import "base/mac/scoped_nsobject.h" | 10 #import "base/mac/scoped_nsobject.h" |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 | 89 |
| 90 @interface BrowserActionButton(TestingAPI) | 90 @interface BrowserActionButton(TestingAPI) |
| 91 // Sets a context menu to use for testing purposes. | 91 // Sets a context menu to use for testing purposes. |
| 92 - (void)setTestContextMenu:(NSMenu*)testContextMenu; | 92 - (void)setTestContextMenu:(NSMenu*)testContextMenu; |
| 93 @end | 93 @end |
| 94 | 94 |
| 95 @interface BrowserActionCell : ImageButtonCell { | 95 @interface BrowserActionCell : ImageButtonCell { |
| 96 @private | 96 @private |
| 97 // The controller for the browser actions bar that owns the button. Weak. | 97 // The controller for the browser actions bar that owns the button. Weak. |
| 98 BrowserActionsController* browserActionsController_; | 98 BrowserActionsController* browserActionsController_; |
| 99 | |
| 100 // The view controller for the parent button. Weak. | |
| 101 ToolbarActionViewController* viewController_; | |
| 102 } | 99 } |
| 103 | 100 |
| 104 @property(assign, nonatomic) | 101 @property(assign, nonatomic) |
| 105 BrowserActionsController* browserActionsController; | 102 BrowserActionsController* browserActionsController; |
| 106 @property(readwrite, nonatomic) ToolbarActionViewController* viewController; | |
| 107 | 103 |
| 108 @end | 104 @end |
| 109 | 105 |
| 110 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_ | 106 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_ |
| OLD | NEW |