diff options
| author | mgiuca <mgiuca@chromium.org> | 2014-09-02 21:43:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-03 04:47:44 +0000 |
| commit | 6af92606baf85644f362190b2036eff65fa89615 (patch) | |
| tree | 603ec0d662e0ced822a5d9f34e34d45e6ca46776 | |
| parent | d2b0dfede32daea43a59c5251c4cce0d03789302 (diff) | |
| download | chromium_src-6af92606baf85644f362190b2036eff65fa89615.zip chromium_src-6af92606baf85644f362190b2036eff65fa89615.tar.gz chromium_src-6af92606baf85644f362190b2036eff65fa89615.tar.bz2 | |
Experimental app list: Remove start page button.
We're experimenting with a minimal UI and there is no real need to have
this button since you don't need to get back to the start page if you
find yourself on some other page.
BUG=406222
Review URL: https://codereview.chromium.org/527203002
Cr-Commit-Position: refs/heads/master@{#293066}
| -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" /> |
