Remove the search icon from the search box in the experimental app list.

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 "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_switches.h"
@@ skipping 65 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SearchBoxBackground);
 };
 
 }  // namespace
 
 SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,
                              AppListViewDelegate* view_delegate)
     : delegate_(delegate),
       view_delegate_(view_delegate),
       model_(NULL),
-      icon_view_(new views::ImageView),
+      icon_view_(NULL),
       speech_button_(NULL),
       search_box_(new views::Textfield),
       contents_view_(NULL) {
-  AddChildView(icon_view_);
-  if (switches::IsExperimentalAppListEnabled())
+  if (switches::IsExperimentalAppListEnabled()) {
     set_background(new SearchBoxBackground());
+  } else {
+    icon_view_ = new views::ImageView;
+    AddChildView(icon_view_);
+  }
 
   views::BoxLayout* layout = new views::BoxLayout(
       views::BoxLayout::kHorizontal, kPadding, 0, kPadding);
   SetLayoutManager(layout);
   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   layout->set_minimum_cross_axis_size(switches::IsExperimentalAppListEnabled()
                                           ? kExperimentalSearchBoxHeight
                                           : kPreferredHeight);
 
@@ skipping 109 matching lines @@
   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() {
-  icon_view_->SetImage(model_->search_box()->icon());
+  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 views::ImageButton(this);
       AddChildView(speech_button_);
     }
@@ skipping 30 matching lines @@
   NotifyQueryChanged();
 }
 
 void SearchBoxView::OnSpeechRecognitionStateChanged(
     SpeechRecognitionState new_state) {
   SpeechRecognitionButtonPropChanged();
   SchedulePaint();
 }
 
 }  // namespace app_list