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

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: split Created 7 years, 7 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 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

Powered by Google App Engine
This is Rietveld 408576698