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

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

Issue 19675010: [win] Initialize the app list menu lazily, and allow invalidation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: constructor does not need delegate, nit name Created 7 years, 5 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/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 6b2b43f903b8501a9aacc5576b668f734ae94dde..a40c33c43f07414bee63a5ea27b9a33df474badf 100644
--- a/ui/app_list/views/search_box_view.h
+++ b/ui/app_list/views/search_box_view.h
@@ -8,7 +8,6 @@
#include <string>
#include "ui/app_list/search_box_model_observer.h"
-#include "ui/app_list/views/app_list_menu_views.h"
#include "ui/views/controls/button/menu_button_listener.h"
#include "ui/views/controls/textfield/textfield_controller.h"
#include "ui/views/view.h"
@@ -21,6 +20,7 @@ class Textfield;
namespace app_list {
+class AppListMenuViews;
class AppListViewDelegate;
class SearchBoxModel;
class SearchBoxViewDelegate;
@@ -34,14 +34,14 @@ class SearchBoxView : public views::View,
public views::MenuButtonListener,
public SearchBoxModelObserver {
public:
- SearchBoxView(SearchBoxViewDelegate* delegate,
- AppListViewDelegate* view_delegate);
+ explicit SearchBoxView(SearchBoxViewDelegate* delegate);
virtual ~SearchBoxView();
void SetModel(SearchBoxModel* model);
bool HasSearch() const;
void ClearSearch();
+ void UpdateMenu(AppListViewDelegate* view_delegate);
views::Textfield* search_box() { return search_box_; }
@@ -80,7 +80,7 @@ class SearchBoxView : public views::View,
SearchBoxViewDelegate* delegate_; // Not owned.
SearchBoxModel* model_; // Owned by AppListModel.
- AppListMenuViews menu_;
+ scoped_ptr<AppListMenuViews> menu_;
views::ImageView* icon_view_; // Owned by views hierarchy.
views::MenuButton* menu_button_; // Owned by views hierarchy.

Powered by Google App Engine
This is Rietveld 408576698