| Index: ui/app_list/views/search_box_view.h
|
| diff --git a/ui/app_list/views/search_box_view.h b/ui/app_list/views/search_box_view.h
|
| index 69b30b444cae1fb24593e66f0750c4bdbc799655..76497fa5d44fe8ce228a7acc074b0daf3cd06a37 100644
|
| --- a/ui/app_list/views/search_box_view.h
|
| +++ b/ui/app_list/views/search_box_view.h
|
| @@ -12,6 +12,8 @@
|
| #include "ui/views/controls/textfield/textfield_controller.h"
|
| #include "ui/views/view.h"
|
|
|
| +struct AvatarMenuItemModel;
|
| +
|
| namespace views {
|
| class ImageView;
|
| class MenuButton;
|
| @@ -22,7 +24,7 @@ namespace app_list {
|
|
|
| class AppListMenuViews;
|
| class AppListViewDelegate;
|
| -class SearchBoxModel;
|
| +class AppListModel;
|
| class SearchBoxViewDelegate;
|
|
|
| // SearchBoxView consists of an icon and a Textfield. SearchBoxModel is its data
|
| @@ -38,7 +40,7 @@ class SearchBoxView : public views::View,
|
| AppListViewDelegate* view_delegate);
|
| virtual ~SearchBoxView();
|
|
|
| - void SetModel(SearchBoxModel* model);
|
| + void SetModel(AppListModel* model);
|
|
|
| bool HasSearch() const;
|
| void ClearSearch();
|
| @@ -80,7 +82,7 @@ class SearchBoxView : public views::View,
|
|
|
| SearchBoxViewDelegate* delegate_; // Not owned.
|
| AppListViewDelegate* view_delegate_; // Not owned.
|
| - SearchBoxModel* model_; // Owned by AppListModel.
|
| + AppListModel* model_; // Not owned.
|
|
|
| scoped_ptr<AppListMenuViews> menu_;
|
|
|
|
|