Index: ui/app_list/cocoa/apps_search_box_controller.h |
diff --git a/ui/app_list/cocoa/apps_search_box_controller.h b/ui/app_list/cocoa/apps_search_box_controller.h |
index f9f7d0d23923dc9834734f484dcb3261b2d1a268..7b2d071fd47ad9db84f87807db1d60fe49bdad63 100644 |
--- a/ui/app_list/cocoa/apps_search_box_controller.h |
+++ b/ui/app_list/cocoa/apps_search_box_controller.h |
@@ -11,23 +11,29 @@ |
#include "base/memory/scoped_ptr.h" |
namespace app_list { |
+class AppListMenu; |
+class AppListViewDelegate; |
class SearchBoxModel; |
class SearchBoxModelObserverBridge; |
} |
@protocol AppsSearchBoxDelegate<NSTextFieldDelegate> |
+- (app_list::AppListViewDelegate*)appListDelegate; |
- (app_list::SearchBoxModel*)searchBoxModel; |
- (void)modelTextDidChange; |
@end |
// Controller for the search box in the topmost portion of the app list. |
-@interface AppsSearchBoxController : NSViewController<NSTextFieldDelegate> { |
+@interface AppsSearchBoxController : NSViewController<NSMenuDelegate, |
+ NSTextFieldDelegate> { |
@private |
scoped_nsobject<NSTextField> searchInput_; |
scoped_nsobject<NSImageView> searchImage_; |
+ scoped_nsobject<NSPopUpButton> menuButton_; |
scoped_ptr<app_list::SearchBoxModelObserverBridge> bridge_; |
+ scoped_ptr<app_list::AppListMenu> appListMenu_; |
id<AppsSearchBoxDelegate> delegate_; // Weak. Owns us. |
} |
@@ -42,6 +48,8 @@ class SearchBoxModelObserverBridge; |
@interface AppsSearchBoxController (TestingAPI) |
- (NSTextField*)textField; |
+- (NSPopUpButton*)menuControl; |
+- (app_list::AppListMenu*)appListMenu; |
@end |