Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1283)

Unified Diff: ui/app_list/cocoa/apps_search_box_controller.h

Issue 15955003: Menu for the OSX app launcher. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Apply CL to master (clean) Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8f048e8a56300a09c5b87cb5e6a6f40aecd92301..3aa840d2d1013bee67ffcc711f52f94313774367 100644
--- a/ui/app_list/cocoa/apps_search_box_controller.h
+++ b/ui/app_list/cocoa/apps_search_box_controller.h
@@ -12,14 +12,19 @@
#include "ui/app_list/app_list_export.h"
namespace app_list {
+class AppListMenu;
+class AppListViewDelegate;
class SearchBoxModel;
class SearchBoxModelObserverBridge;
}
+@class HoverImageMenuButton;
+@class AppListMenuController;
@class SearchTextField;
@protocol AppsSearchBoxDelegate<NSTextFieldDelegate>
+- (app_list::AppListViewDelegate*)appListDelegate;
- (app_list::SearchBoxModel*)searchBoxModel;
- (void)modelTextDidChange;
@@ -31,7 +36,10 @@ APP_LIST_EXPORT
@private
scoped_nsobject<SearchTextField> searchTextField_;
scoped_nsobject<NSImageView> searchImageView_;
+ scoped_nsobject<HoverImageMenuButton> menuButton_;
+ scoped_nsobject<AppListMenuController> menuController_;
scoped_ptr<app_list::SearchBoxModelObserverBridge> bridge_;
+ scoped_ptr<app_list::AppListMenu> appListMenu_;
id<AppsSearchBoxDelegate> delegate_; // Weak. Owns us.
}
@@ -46,6 +54,8 @@ APP_LIST_EXPORT
@interface AppsSearchBoxController (TestingAPI)
- (NSTextField*)searchTextField;
+- (NSPopUpButton*)menuControl;
+- (app_list::AppListMenu*)appListMenu;
@end

Powered by Google App Engine
This is Rietveld 408576698