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

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: rebase/no-op because CQ is wedged 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
« no previous file with comments | « ui/app_list/views/app_list_view.cc ('k') | ui/app_list/views/search_box_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..69b30b444cae1fb24593e66f0750c4bdbc799655 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;
@@ -42,6 +42,7 @@ class SearchBoxView : public views::View,
bool HasSearch() const;
void ClearSearch();
+ void InvalidateMenu();
views::Textfield* search_box() { return search_box_; }
@@ -78,9 +79,10 @@ class SearchBoxView : public views::View,
virtual void TextChanged() OVERRIDE;
SearchBoxViewDelegate* delegate_; // Not owned.
+ AppListViewDelegate* view_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.
« no previous file with comments | « ui/app_list/views/app_list_view.cc ('k') | ui/app_list/views/search_box_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698