Remove old (dead) app list code.

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 "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 35 matching lines @@
 
 const SkColor kHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0);
 
 // Menu offset relative to the bottom-right corner of the menu button.
 const int kMenuYOffsetFromButton = -4;
 const int kMenuXOffsetFromButton = -7;
 
 const int kBackgroundBorderCornerRadius = 2;
 
 // A background that paints a solid white rounded rect with a thin grey border.
-class ExperimentalSearchBoxBackground : public views::Background {
+class SearchBoxBackground : public views::Background {
  public:
-  ExperimentalSearchBoxBackground() {}
-  ~ExperimentalSearchBoxBackground() override {}
+  SearchBoxBackground() {}
+  ~SearchBoxBackground() override {}
 
  private:
   // views::Background overrides:
   void Paint(gfx::Canvas* canvas, views::View* view) const override {
     gfx::Rect bounds = view->GetContentsBounds();
 
     SkPaint paint;
     paint.setFlags(SkPaint::kAntiAlias_Flag);
     paint.setColor(kSearchBoxBackground);
     canvas->DrawRoundRect(bounds, kBackgroundBorderCornerRadius, paint);
   }
 
-  DISALLOW_COPY_AND_ASSIGN(ExperimentalSearchBoxBackground);
+  DISALLOW_COPY_AND_ASSIGN(SearchBoxBackground);
 };
 
 }  // namespace
 
 // To paint grey background on mic and back buttons
 class SearchBoxImageButton : public views::ImageButton {
  public:
   explicit SearchBoxImageButton(views::ButtonListener* listener)
       : ImageButton(listener), selected_(false) {}
   ~SearchBoxImageButton() override {}
@@ skipping 31 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(SearchBoxImageButton);
 };
 
 SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,
                              AppListViewDelegate* view_delegate)
     : delegate_(delegate),
       view_delegate_(view_delegate),
       model_(NULL),
       content_container_(new views::View),
-      icon_view_(NULL),
       back_button_(NULL),
       speech_button_(NULL),
       menu_button_(NULL),
       search_box_(new views::Textfield),
       contents_view_(NULL),
       focused_view_(FOCUS_SEARCH_BOX) {
   SetLayoutManager(new views::FillLayout);
   AddChildView(content_container_);
 
-  if (switches::IsExperimentalAppListEnabled()) {
-    SetShadow(GetShadowForZHeight(2));
-    back_button_ = new SearchBoxImageButton(this);
-    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    back_button_->SetImage(
-        views::ImageButton::STATE_NORMAL,
-        rb.GetImageSkiaNamed(IDR_APP_LIST_FOLDER_BACK_NORMAL));
-    back_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
-                                    views::ImageButton::ALIGN_MIDDLE);
-    SetBackButtonLabel(false);
-    content_container_->AddChildView(back_button_);
-
-    content_container_->set_background(new ExperimentalSearchBoxBackground());
-  } else {
-    set_background(
-        views::Background::CreateSolidBackground(kSearchBoxBackground));
-    SetBorder(
-        views::Border::CreateSolidSidedBorder(0, 0, 1, 0, kTopSeparatorColor));
-    icon_view_ = new views::ImageView;
-    content_container_->AddChildView(icon_view_);
-  }
+  SetShadow(GetShadowForZHeight(2));
+  back_button_ = new SearchBoxImageButton(this);
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  back_button_->SetImage(views::ImageButton::STATE_NORMAL,
+                         rb.GetImageSkiaNamed(IDR_APP_LIST_FOLDER_BACK_NORMAL));
+  back_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
+                                  views::ImageButton::ALIGN_MIDDLE);
+  SetBackButtonLabel(false);
+  content_container_->AddChildView(back_button_);
+  content_container_->set_background(new SearchBoxBackground());
 
   views::BoxLayout* layout =
       new views::BoxLayout(views::BoxLayout::kHorizontal, kPadding, 0,
                            kInnerPadding - views::Textfield::kTextPadding);
   content_container_->SetLayoutManager(layout);
   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   layout->set_minimum_cross_axis_size(kPreferredHeight);
 
   search_box_->SetBorder(views::Border::NullBorder());
   search_box_->SetTextColor(kSearchTextColor);
   search_box_->SetBackgroundColor(kSearchBoxBackground);
   search_box_->set_placeholder_text_color(kHintTextColor);
   search_box_->set_controller(this);
   search_box_->SetTextInputType(ui::TEXT_INPUT_TYPE_SEARCH);
   search_box_->SetTextInputFlags(ui::TEXT_INPUT_FLAG_AUTOCORRECT_OFF);
   content_container_->AddChildView(search_box_);
   layout->SetFlexForView(search_box_, 1);
 
 #if !defined(OS_CHROMEOS)
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  // TODO(mgiuca): Remove the menu (this code doesn't run on non-Chrome-OS so
+  // the menu will never be created). https://crbug.com/600915.
   menu_button_ = new views::MenuButton(base::string16(), this, false);
   menu_button_->SetBorder(views::Border::NullBorder());
   menu_button_->SetImage(views::Button::STATE_NORMAL,
                          *rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_NORMAL));
   menu_button_->SetImage(views::Button::STATE_HOVERED,
                          *rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_HOVER));
   menu_button_->SetImage(views::Button::STATE_PRESSED,
                          *rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_PRESSED));
   content_container_->AddChildView(menu_button_);
 #endif
 
   view_delegate_->GetSpeechUI()->AddObserver(this);
   ModelChanged();
 }
 
 SearchBoxView::~SearchBoxView() {
   view_delegate_->GetSpeechUI()->RemoveObserver(this);
   model_->search_box()->RemoveObserver(this);
 }
 
 void SearchBoxView::ModelChanged() {
   if (model_)
     model_->search_box()->RemoveObserver(this);
 
   model_ = view_delegate_->GetModel();
   DCHECK(model_);
   model_->search_box()->AddObserver(this);
-  IconChanged();
   SpeechRecognitionButtonPropChanged();
   HintTextChanged();
 }
 
 bool SearchBoxView::HasSearch() const {
   return !search_box_->text().empty();
 }
 
 void SearchBoxView::ClearSearch() {
   search_box_->SetText(base::string16());
@@ skipping 211 matching lines @@
                                         const ui::Event* event) {
   if (!menu_)
     menu_.reset(new AppListMenuViews(view_delegate_));
 
   const gfx::Point menu_location =
       menu_button_->GetBoundsInScreen().bottom_right() +
       gfx::Vector2d(kMenuXOffsetFromButton, kMenuYOffsetFromButton);
   menu_->RunMenuAt(menu_button_, menu_location);
 }
 
-void SearchBoxView::IconChanged() {
-  if (icon_view_)
-    icon_view_->SetImage(model_->search_box()->icon());
-}
-
 void SearchBoxView::SpeechRecognitionButtonPropChanged() {
   const SearchBoxModel::SpeechButtonProperty* speech_button_prop =
       model_->search_box()->speech_button();
   if (speech_button_prop) {
     if (!speech_button_) {
       speech_button_ = new SearchBoxImageButton(this);
       content_container_->AddChildView(speech_button_);
     }
 
     speech_button_->SetAccessibleName(speech_button_prop->accessible_name);
@@ skipping 32 matching lines @@
   NotifyQueryChanged();
 }
 
 void SearchBoxView::OnSpeechRecognitionStateChanged(
     SpeechRecognitionState new_state) {
   SpeechRecognitionButtonPropChanged();
   SchedulePaint();
 }
 
 }  // namespace app_list