Commit 88de9111 authored by calamity's avatar calamity Committed by Commit bot

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

This CL removes the magnifying glass icon from the experimental app
list. The normal app list should be unaffected

BUG=406222

Review URL: https://codereview.chromium.org/503693002

Cr-Commit-Position: refs/heads/master@{#292569}
parent 9262ebc4
...@@ -83,13 +83,16 @@ SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate, ...@@ -83,13 +83,16 @@ SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,
: delegate_(delegate), : delegate_(delegate),
view_delegate_(view_delegate), view_delegate_(view_delegate),
model_(NULL), model_(NULL),
icon_view_(new views::ImageView), icon_view_(NULL),
speech_button_(NULL), speech_button_(NULL),
search_box_(new views::Textfield), search_box_(new views::Textfield),
contents_view_(NULL) { contents_view_(NULL) {
AddChildView(icon_view_); if (switches::IsExperimentalAppListEnabled()) {
if (switches::IsExperimentalAppListEnabled())
set_background(new SearchBoxBackground()); set_background(new SearchBoxBackground());
} else {
icon_view_ = new views::ImageView;
AddChildView(icon_view_);
}
views::BoxLayout* layout = new views::BoxLayout( views::BoxLayout* layout = new views::BoxLayout(
views::BoxLayout::kHorizontal, kPadding, 0, kPadding); views::BoxLayout::kHorizontal, kPadding, 0, kPadding);
...@@ -219,7 +222,8 @@ void SearchBoxView::OnMenuButtonClicked(View* source, const gfx::Point& point) { ...@@ -219,7 +222,8 @@ void SearchBoxView::OnMenuButtonClicked(View* source, const gfx::Point& point) {
} }
void SearchBoxView::IconChanged() { void SearchBoxView::IconChanged() {
icon_view_->SetImage(model_->search_box()->icon()); if (icon_view_)
icon_view_->SetImage(model_->search_box()->icon());
} }
void SearchBoxView::SpeechRecognitionButtonPropChanged() { void SearchBoxView::SpeechRecognitionButtonPropChanged() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment