[win] Initialize the app list menu lazily, and allow invalidation.

ui/app_list/views/search_box_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/app_list/views/search_box_view.h"
 
 #include <algorithm>
 
 #include "grit/ui_resources.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/search_box_view_delegate.h"
+#include "ui/app_list/views/app_list_menu_views.h"
 #include "ui/base/events/event.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 
 namespace app_list {
 
 namespace {
 
 const int kPadding = 14;
 const int kIconDimension = 32;
 const int kPreferredWidth = 360;
 const int kPreferredHeight = 48;
 const int kMenuButtonDimension = 29;
 
 const SkColor kHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0);
 
 }  // namespace
 
-SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,
-                             AppListViewDelegate* view_delegate)
+SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate)
     : delegate_(delegate),
       model_(NULL),
-      menu_(view_delegate),
       icon_view_(new views::ImageView),
       search_box_(new views::Textfield),
       contents_view_(NULL) {
   AddChildView(icon_view_);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
 #if !defined(OS_CHROMEOS)
   menu_button_ = new views::MenuButton(NULL, base::string16(), this, false);
   menu_button_->set_border(NULL);
@@ skipping 36 matching lines @@
 }
 
 void SearchBoxView::ClearSearch() {
   search_box_->SetText(base::string16());
   // Updates model and fires query changed manually because SetText() above
   // does not generate ContentsChanged() notification.
   UpdateModel();
   NotifyQueryChanged();
 }
 
+void SearchBoxView::UpdateMenu(AppListViewDelegate* view_delegate) {
+  menu_.reset(new AppListMenuViews(view_delegate));
+}
+
 gfx::Size SearchBoxView::GetPreferredSize() {
   return gfx::Size(kPreferredWidth, kPreferredHeight);
 }
 
 void SearchBoxView::Layout() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
   gfx::Rect icon_frame(rect);
@@ skipping 49 matching lines @@
 bool SearchBoxView::HandleKeyEvent(views::Textfield* sender,
                                    const ui::KeyEvent& key_event) {
   bool handled = false;
   if (contents_view_ && contents_view_->visible())
     handled = contents_view_->OnKeyPressed(key_event);
 
   return handled;
 }
 
 void SearchBoxView::OnMenuButtonClicked(View* source, const gfx::Point& point) {
-  menu_.RunMenuAt(menu_button_,
-                  menu_button_->GetBoundsInScreen().bottom_right());
+  menu_->RunMenuAt(menu_button_,
+                   menu_button_->GetBoundsInScreen().bottom_right());
 }
 
 void SearchBoxView::IconChanged() {
   icon_view_->SetImage(model_->icon());
 }
 
 void SearchBoxView::HintTextChanged() {
   search_box_->set_placeholder_text(model_->hint_text());
 }
 
 void SearchBoxView::SelectionModelChanged() {
   search_box_->SelectSelectionModel(model_->selection_model());
 }
 
 void SearchBoxView::TextChanged() {
   search_box_->SetText(model_->text());
 }
 
 }  // namespace app_list