Move app list search box into AppListView.

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"
 #include "base/strings/string_util.h"
 #include "base/win/windows_version.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/speech_ui_model.h"
 #include "ui/app_list/views/app_list_background.h"
 #include "ui/app_list/views/app_list_folder_view.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/app_list_view_observer.h"
 #include "ui/app_list/views/apps_container_view.h"
 #include "ui/app_list/views/contents_view.h"
-#include "ui/app_list/views/search_box_view.h"
 #include "ui/app_list/views/speech_view.h"
 #include "ui/app_list/views/start_page_view.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/path.h"
@@ skipping 109 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(HideViewAnimationObserver);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListView:
 
 AppListView::AppListView(AppListViewDelegate* delegate)
     : delegate_(delegate),
       app_list_main_view_(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);
 }
 
@@ skipping 161 matching lines @@
                                        views::BubbleBorder::Arrow arrow,
                                        bool border_accepts_events,
                                        const gfx::Vector2d& anchor_offset) {
   base::Time start_time = base::Time::Now();
 
   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);
-  app_list_main_view_->Init(parent, initial_apps_page);
+
+  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_);
   }
@@ skipping 140 matching lines @@
       GetWidget()->Deactivate();
       Close();
     }
     return true;
   }
 
   return false;
 }
 
 void AppListView::Layout() {
+  search_box_view_->SetBoundsRect(
+      app_list_main_view_->contents_view()->GetDefaultSearchBoxBounds());
+
   const gfx::Rect contents_bounds = GetContentsBounds();
   app_list_main_view_->SetBoundsRect(contents_bounds);
 
   if (speech_view_) {
     gfx::Rect speech_bounds = contents_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());
@@ skipping 89 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