Make app list search box into a Widget.

ui/app_list/views/app_list_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/app_list_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 139 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(HideViewAnimationObserver);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListView:
 
 AppListView::AppListView(AppListViewDelegate* delegate)
     : delegate_(delegate),
       app_list_main_view_(NULL),
+      speech_view_(NULL),

[Matt Giuca, 2014/12/02 07:55:14]

nullptr all these.

[calamity, 2014/12/03 03:31:26]

Done.

+      search_box_widget_(NULL),
       search_box_view_(NULL),
-      speech_view_(NULL),
       experimental_banner_view_(NULL),
       overlay_view_(NULL),
       animation_observer_(new HideViewAnimationObserver()) {
   CHECK(delegate);
 
   delegate_->AddObserver(this);
   delegate_->GetSpeechUI()->AddObserver(this);
 }
 
 AppListView::~AppListView() {
@@ skipping 40 matching lines @@
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.parent = parent;
   params.delegate = this;
   widget->Init(params);
   widget->SetBounds(bounds);
   // This needs to be set *after* Widget::Init() because BubbleDelegateView sets
   // its own background at OnNativeThemeChanged(), which is called in
   // View::AddChildView() which is called at Widget::SetContentsView() to build
   // the views hierarchy in the widget.
   set_background(new AppListBackground(0, app_list_main_view_));
+
+  InitChildWidgets();
 }
 
 void AppListView::SetBubbleArrow(views::BubbleBorder::Arrow arrow) {
   GetBubbleFrameView()->bubble_border()->set_arrow(arrow);
   SizeToContents();  // Recalcuates with new border.
   GetBubbleFrameView()->SchedulePaint();
 }
 
 void AppListView::SetAnchorPoint(const gfx::Point& anchor_point) {
   SetAnchorRect(gfx::Rect(anchor_point, gfx::Size()));
@@ skipping 116 matching lines @@
       ->pagination_model();
 }
 
 void AppListView::InitContents(gfx::NativeView parent, int initial_apps_page) {
   app_list_main_view_ = new AppListMainView(delegate_);
   AddChildView(app_list_main_view_);
   app_list_main_view_->SetPaintToLayer(true);
   app_list_main_view_->SetFillsBoundsOpaquely(false);
   app_list_main_view_->layer()->SetMasksToBounds(true);
 
+  // This will be added to the |search_box_widget_| after the app list widget is
+  // initialized.
   search_box_view_ = new SearchBoxView(app_list_main_view_, delegate_);
   search_box_view_->SetPaintToLayer(true);
   search_box_view_->SetFillsBoundsOpaquely(false);
   search_box_view_->layer()->SetMasksToBounds(true);
-  AddChildView(search_box_view_);
 
   app_list_main_view_->Init(parent, initial_apps_page, search_box_view_);
 
   // Speech recognition is available only when the start page exists.
   if (delegate_ && delegate_->IsSpeechRecognitionEnabled()) {
     speech_view_ = new SpeechView(delegate_);
     speech_view_->SetVisible(false);
     speech_view_->SetPaintToLayer(true);
     speech_view_->SetFillsBoundsOpaquely(false);
     speech_view_->layer()->SetOpacity(0.0f);
     AddChildView(speech_view_);
   }
 
   if (app_list::switches::IsExperimentalAppListEnabled()) {
     // Draw a banner in the corner of the experimental app list.
     experimental_banner_view_ = new views::ImageView;
     const gfx::ImageSkia& experimental_icon =
         *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_APP_LIST_EXPERIMENTAL_ICON);
     experimental_banner_view_->SetImage(experimental_icon);
     experimental_banner_view_->SetPaintToLayer(true);
     experimental_banner_view_->SetFillsBoundsOpaquely(false);
     AddChildView(experimental_banner_view_);
   }
 
   OnProfilesChanged();
 }
 
+void AppListView::InitChildWidgets() {
+  DCHECK(search_box_view_);
+
+  app_list_main_view_->InitWidgets();
+
+  // Create the search box widget.
+  views::Widget::InitParams search_box_widget_params(
+      views::Widget::InitParams::TYPE_CONTROL);
+  search_box_widget_params.parent = GetWidget()->GetNativeView();
+  search_box_widget_params.opacity =
+      views::Widget::InitParams::TRANSLUCENT_WINDOW;
+
+  // Create a widget for the SearchBoxView to live in. This widget allows the
+  // SearchBoxView to receive events before the custom launcher page's

[Matt Giuca, 2014/12/02 07:55:14]

I don't really think of it as "before / after", rather "on top / underneath".
Say "This allows the SearchBoxView to be on top of the custom launcher page's
WebContents (otherwise the search box events will be captured by the
WebContents)." Or similar.

[calamity, 2014/12/03 03:31:26]

Done.

+  // WebContents.
+  search_box_widget_ = new views::Widget;
+  search_box_widget_->Init(search_box_widget_params);
+  search_box_widget_->SetContentsView(search_box_view_);
+
+  Layout();
+}
+
 void AppListView::InitAsBubbleInternal(gfx::NativeView parent,
                                        int initial_apps_page,
                                        views::BubbleBorder::Arrow arrow,
                                        bool border_accepts_events,
                                        const gfx::Vector2d& anchor_offset) {
   // TODO(vadimt): Remove ScopedTracker below once crbug.com/431326 is fixed.
   tracked_objects::ScopedTracker tracking_profile1(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "431326 AppListView::InitAsBubbleInternal1"));
 
@@ skipping 17 matching lines @@
                                      kArrowOffset - anchor_offset.x()));
   set_border_accepts_events(border_accepts_events);
   set_shadow(SupportsShadow() ? views::BubbleBorder::BIG_SHADOW
                               : views::BubbleBorder::NO_SHADOW_OPAQUE_BORDER);
   // This creates the app list widget. (Before this, child widgets cannot be
   // created.)
   views::BubbleDelegateView::CreateBubble(this);
   SetBubbleArrow(arrow);
 
   // We can now create the internal widgets.
-  app_list_main_view_->InitWidgets();
+  InitChildWidgets();
 
 #if defined(USE_AURA)
   // TODO(vadimt): Remove ScopedTracker below once crbug.com/431326 is fixed.
   tracked_objects::ScopedTracker tracking_profile3(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "431326 AppListView::InitAsBubbleInternal3"));
 
   aura::Window* window = GetWidget()->GetNativeWindow();
   window->layer()->SetMasksToBounds(true);
   GetBubbleFrameView()->set_background(new AppListBackground(
@@ skipping 130 matching lines @@
 
   app_list_main_view_->SetBoundsRect(centered_bounds);
 
   // GetDefaultSearchBoxBounds() returns the bounds in |contents_view|'s
   // coordinate, therefore convert it to this coordinate.
   ContentsView* contents_view = app_list_main_view_->contents_view();
   // TODO(mgiuca): Position the search box in the center of the page, when
   // in STATE_START.
   gfx::RectF search_box_bounds = contents_view->GetDefaultSearchBoxBounds();
   ConvertRectToTarget(contents_view, this, &search_box_bounds);
-  search_box_view_->SetBoundsRect(gfx::ToNearestRect(search_box_bounds));
+  if (search_box_widget_) {

[Matt Giuca, 2014/12/02 07:55:14]

Just checking: Can this be a DCHECK or are there situations where it is null?

[calamity, 2014/12/03 03:31:26]

It's null on initial layout unfortunately. This is because the Widget lays out
its root view when it is created, but the search_box_widget isn't added until
later.

+    search_box_widget_->SetBounds(
+        ConvertRectToWidget(gfx::ToNearestRect(search_box_bounds)));
+  }
 
   if (speech_view_) {
     gfx::Rect speech_bounds = centered_bounds;
     int preferred_height = speech_view_->GetPreferredSize().height();
     speech_bounds.Inset(kSpeechUIMargin, kSpeechUIMargin);
     speech_bounds.set_height(std::min(speech_bounds.height(),
                                       preferred_height));
     speech_bounds.Inset(-speech_view_->GetInsets());
     speech_view_->SetBoundsRect(speech_bounds);
   }
@@ skipping 90 matching lines @@
       speech_view_->layer()->SetTransform(speech_transform);
   }
 
   if (will_appear)
     speech_view_->SetVisible(true);
   else
     app_list_main_view_->SetVisible(true);
 }
 
 }  // namespace app_list