| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/app_list/views/search_result_page_view.h" | 5 #include "ui/app_list/views/search_result_page_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ui/app_list/app_list_constants.h" | 9 #include "ui/app_list/app_list_constants.h" |
| 10 #include "ui/app_list/app_list_switches.h" | 10 #include "ui/app_list/app_list_switches.h" |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 to_state != AppListModel::STATE_SEARCH_RESULTS) { | 185 to_state != AppListModel::STATE_SEARCH_RESULTS) { |
| 186 return; | 186 return; |
| 187 } | 187 } |
| 188 | 188 |
| 189 gfx::Rect onscreen_bounds( | 189 gfx::Rect onscreen_bounds( |
| 190 GetPageBoundsForState(AppListModel::STATE_SEARCH_RESULTS)); | 190 GetPageBoundsForState(AppListModel::STATE_SEARCH_RESULTS)); |
| 191 set_clip_insets(bounds().InsetsFrom(onscreen_bounds)); | 191 set_clip_insets(bounds().InsetsFrom(onscreen_bounds)); |
| 192 } | 192 } |
| 193 | 193 |
| 194 int SearchResultPageView::GetSearchBoxZHeight() const { | 194 int SearchResultPageView::GetSearchBoxZHeight() const { |
| 195 return kSearchResultZHeight; | 195 return switches::IsExperimentalAppListEnabled() |
| 196 ? kSearchResultZHeight |
| 197 : AppListPage::GetSearchBoxZHeight(); |
| 196 } | 198 } |
| 197 | 199 |
| 198 } // namespace app_list | 200 } // namespace app_list |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1027513004:
Fix search box shadowing issue on classic app list. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@content_view_base_class