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

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

Issue 22268009: Move signin status and current user information into AppListModel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: implemented for mac Created 7 years, 4 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.mm
diff --git a/ui/app_list/cocoa/apps_search_box_controller.mm b/ui/app_list/cocoa/apps_search_box_controller.mm
index 6d38f94c5c1ac5f0a3ce7414af81aee1eabcc247..90f069a07cf59dc5d05ba157930b113eb6b74983 100644
--- a/ui/app_list/cocoa/apps_search_box_controller.mm
+++ b/ui/app_list/cocoa/apps_search_box_controller.mm
@@ -6,11 +6,12 @@
#include "base/mac/foundation_util.h"
#include "base/mac/mac_util.h"
-#include "base/strings/sys_string_conversions.h"
#include "grit/ui_resources.h"
#import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h"
#include "ui/app_list/app_list_menu.h"
#import "ui/app_list/cocoa/current_user_menu_item_view.h"
+#include "ui/app_list/app_list_model.h"
tapted 2013/08/14 03:53:11 I think you can get by without changing #includes
calamity 2013/08/14 09:19:00 Done.
+#include "ui/app_list/app_list_view_delegate.h"
#include "ui/app_list/search_box_model.h"
#include "ui/app_list/search_box_model_observer.h"
#import "ui/base/cocoa/controls/hover_image_menu_button.h"
@@ -373,7 +374,8 @@ void SearchBoxModelObserverBridge::TextChanged() {
return;
base::scoped_nsobject<NSView> customItemView([[CurrentUserMenuItemView alloc]
- initWithDelegate:[[searchBoxController_ delegate] appListDelegate]]);
+ initWithCurrentUser:[[searchBoxController_ delegate] currentUserName]
+ userEmail:[[searchBoxController_ delegate] currentUserEmail]]);
[[menu itemAtIndex:index] setView:customItemView];
}

Powered by Google App Engine
This is Rietveld 408576698