ui/app_list/views/app_list_background.cc - Issue 493293003: Use a background for the main search box in the experimental app list.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/app_list/views/app_list_background.cc

Issue 493293003: Use a background for the main search box in the experimental app list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: change constants to be closer to mocks Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: ui/app_list/views/app_list_background.cc

diff --git a/ui/app_list/views/app_list_background.cc b/ui/app_list/views/app_list_background.cc

index b3a3ea38d5b8c3092c48af45ebaf13d8cea7abba..0f66f7ffb718b7375d9206e3c61e4c0527e48d5e 100644

--- a/ui/app_list/views/app_list_background.cc

+++ b/ui/app_list/views/app_list_background.cc

@@ -54,7 +54,8 @@ void AppListBackground::Paint(gfx::Canvas* canvas,

int contents_top = bounds.y();

views::View* search_box_view = main_view_->search_box_view();

- if (main_view_->visible() && search_box_view->visible()) {

+ if (main_view_->visible() && search_box_view->visible() &&

+ !app_list::switches::IsExperimentalAppListEnabled()) {

const gfx::Rect search_box_view_bounds =

search_box_view->ConvertRectToWidget(search_box_view->GetLocalBounds());

gfx::Rect search_box_rect(bounds.x(),

« no previous file with comments | « ui/app_list/app_list_constants.cc ('k') | ui/app_list/views/app_list_main_view.cc » ('j') | ui/app_list/views/app_list_main_view.cc » ('J')