chrome/browser/ui/ash/app_list/app_list_service_ash.cc - Issue 947903002: Change ContentsView::SetActivePage to use States rather than indexes.

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: chrome/browser/ui/ash/app_list/app_list_service_ash.cc

Issue 947903002: Change ContentsView::SetActivePage to use States rather than indexes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more_rebase Created 5 years, 9 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: chrome/browser/ui/ash/app_list/app_list_service_ash.cc

diff --git a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc

index 6d0fd0a1a4ced61a6e59fb6f0e4013f0164900ca..2b325d40c2090695516f0c89aaa8d7886b910613 100644

--- a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc

+++ b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc

@@ -49,8 +49,7 @@ void AppListServiceAsh::ShowAndSwitchToState(

app_list::ContentsView* contents_view =

app_list_view->app_list_main_view()->contents_view();

- contents_view->SetActivePage(contents_view->GetPageIndexForState(state),

- app_list_was_open /* animate */);

+ contents_view->SetActiveState(state, app_list_was_open /* animate */);

}

void AppListServiceAsh::Init(Profile* initial_profile) {

« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_views.cc ('k') | ui/app_list/views/all_apps_tile_item_view.cc » ('j') | no next file with comments »