diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app_list/views/contents_view.cc | 5 | ||||
| -rw-r--r-- | ui/resources/default_100_percent/common/app_list_search_icon.png | bin | 866 -> 0 bytes | |||
| -rw-r--r-- | ui/resources/default_200_percent/common/app_list_search_icon.png | bin | 2208 -> 0 bytes | |||
| -rw-r--r-- | ui/resources/ui_resources.grd | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/ui/app_list/views/contents_view.cc b/ui/app_list/views/contents_view.cc index c9d09fe..3b4d620 100644 --- a/ui/app_list/views/contents_view.cc +++ b/ui/app_list/views/contents_view.cc @@ -47,8 +47,7 @@ void ContentsView::InitNamedPages(AppListModel* model, if (app_list::switches::IsExperimentalAppListEnabled()) { start_page_view_ = new StartPageView(app_list_main_view_, view_delegate); - AddLauncherPage( - start_page_view_, IDR_APP_LIST_SEARCH_ICON, NAMED_PAGE_START); + AddLauncherPage(start_page_view_, 0, NAMED_PAGE_START); } else { search_results_view_ = new SearchResultListView(app_list_main_view_, view_delegate); @@ -245,7 +244,7 @@ int ContentsView::AddLauncherPage(views::View* view, int resource_id) { int page_index = view_model_->view_size(); AddChildView(view); view_model_->Add(view, page_index); - if (contents_switcher_view_) + if (contents_switcher_view_ && resource_id) contents_switcher_view_->AddSwitcherButton(resource_id, page_index); pagination_model_.SetTotalPages(view_model_->view_size()); return page_index; diff --git a/ui/resources/default_100_percent/common/app_list_search_icon.png b/ui/resources/default_100_percent/common/app_list_search_icon.png Binary files differdeleted file mode 100644 index a48f790..0000000 --- a/ui/resources/default_100_percent/common/app_list_search_icon.png +++ /dev/null diff --git a/ui/resources/default_200_percent/common/app_list_search_icon.png b/ui/resources/default_200_percent/common/app_list_search_icon.png Binary files differdeleted file mode 100644 index e422c26..0000000 --- a/ui/resources/default_200_percent/common/app_list_search_icon.png +++ /dev/null diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index 283d0eb..f84b160 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -26,7 +26,6 @@ <structure type="chrome_scaled_image" name="IDR_APP_LIST_TOOLS_NORMAL" file="common/app_list_tools_normal.png" /> <structure type="chrome_scaled_image" name="IDR_APP_LIST_TOOLS_PRESSED" file="common/app_list_tools_pressed.png" /> <structure type="chrome_scaled_image" name="IDR_APP_LIST_FOLDER_BACK_NORMAL" file="common/app_list_folder_back_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_LIST_SEARCH_ICON" file="common/app_list_search_icon.png" /> <structure type="chrome_scaled_image" name="IDR_APP_LIST_SPEECH_MIC_ON" file="common/app_list_mic_on.png" /> <structure type="chrome_scaled_image" name="IDR_APP_LIST_SPEECH_MIC_OFF" file="common/app_list_mic_off.png" /> <structure type="chrome_scaled_image" name="IDR_APP_LIST_SPEECH_MIC_RECORDING" file="common/app_list_mic_recording.png" /> |
