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

Unified Diff: ui/app_list/views/app_list_main_view.h

Issue 657653002: Move app list search box into AppListView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « ui/app_list/views/app_list_background.cc ('k') | ui/app_list/views/app_list_main_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_main_view.h
diff --git a/ui/app_list/views/app_list_main_view.h b/ui/app_list/views/app_list_main_view.h
index 09df64c11f0f291fb7ad4b1ef0c68aa94ef65a39..f14e44b245715dcb93de1c87d9f936654646f12c 100644
--- a/ui/app_list/views/app_list_main_view.h
+++ b/ui/app_list/views/app_list_main_view.h
@@ -42,7 +42,9 @@ class APP_LIST_EXPORT AppListMainView : public views::View,
explicit AppListMainView(AppListViewDelegate* delegate);
virtual ~AppListMainView();
- void Init(gfx::NativeView parent, int initial_apps_page);
+ void Init(gfx::NativeView parent,
+ int initial_apps_page,
+ SearchBoxView* search_box_view);
void ShowAppListWhenReady();
@@ -113,7 +115,8 @@ class APP_LIST_EXPORT AppListMainView : public views::View,
AppListViewDelegate* delegate_; // Owned by parent view (AppListView).
AppListModel* model_; // Unowned; ownership is handled by |delegate_|.
- SearchBoxView* search_box_view_; // Owned by views hierarchy.
+ // Created by AppListView. Owned by views hierarchy.
+ SearchBoxView* search_box_view_;
ContentsView* contents_view_; // Owned by views hierarchy.
// Owned by views hierarchy. NULL in the non-experimental app list.
« no previous file with comments | « ui/app_list/views/app_list_background.cc ('k') | ui/app_list/views/app_list_main_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698