Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(466)

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

Issue 683703002: Notify launcher page with onTransitionChanged event (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@launcher_page_api_show_state_notify
Patch Set: Created 6 years, 2 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/contents_view.cc
diff --git a/ui/app_list/views/contents_view.cc b/ui/app_list/views/contents_view.cc
index 1bc3e5b1bd44de5b9a9f4b6dbc601f6382a67851..478003a22fecd61b77208dbb37da334d4e9eb315 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -56,7 +56,14 @@ void ContentsView::Init(AppListModel* model,
custom_page_views.begin();
it != custom_page_views.end();
++it) {
- AddLauncherPage(*it, IDR_APP_LIST_NOTIFICATIONS_ICON);
+ // Only the first launcher page should be the custom launcher page state.
+ if (it == custom_page_views.begin()) {
+ AddLauncherPage(*it,
+ IDR_APP_LIST_NOTIFICATIONS_ICON,
+ AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
+ } else {
+ AddLauncherPage(*it, IDR_APP_LIST_NOTIFICATIONS_ICON);
+ }
}
start_page_view_ = new StartPageView(app_list_main_view_, view_delegate);
« chrome/common/extensions/api/_permission_features.json ('K') | « ui/app_list/app_list_model.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698