Notify launcher page with onTransitionChanged event

ui/app_list/views/contents_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/app_list/views/contents_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 27 matching lines @@
                                            kOverscrollPageTransitionDurationMs);
   pagination_model_.AddObserver(this);
 }
 
 ContentsView::~ContentsView() {
   pagination_model_.RemoveObserver(this);
   if (contents_switcher_view_)
     pagination_model_.RemoveObserver(contents_switcher_view_);
 }
 
-void ContentsView::Init(AppListModel* model,
-                        AppListViewDelegate* view_delegate) {
+void ContentsView::Init(AppListModel* model) {
   DCHECK(model);
 
+  AppListViewDelegate* view_delegate = app_list_main_view_->view_delegate();
+
   if (app_list::switches::IsExperimentalAppListEnabled()) {
     std::vector<views::View*> custom_page_views =
         view_delegate->CreateCustomPageWebViews(GetLocalBounds().size());
     for (std::vector<views::View*>::const_iterator it =
              custom_page_views.begin();
          it != custom_page_views.end();
          ++it) {
-      AddLauncherPage(*it, IDR_APP_LIST_NOTIFICATIONS_ICON);
+      // Only the first launcher page is considered to represent
+      // STATE_CUSTOM_LAUNCHER_PAGE.
+      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);
     AddLauncherPage(
         start_page_view_, IDR_APP_LIST_SEARCH_ICON, AppListModel::STATE_START);
   } else {
     search_results_view_ =
         new SearchResultListView(app_list_main_view_, view_delegate);
     AddLauncherPage(
         search_results_view_, 0, AppListModel::STATE_SEARCH_RESULTS);
@@ skipping 134 matching lines @@
   // The start page and search page origins are above; all other pages' origins
   // are below.
   int page_height = bounds.height();
   bool origin_above =
       GetPageIndexForState(AppListModel::STATE_START) == page_index ||
       GetPageIndexForState(AppListModel::STATE_SEARCH_RESULTS) == page_index;
   bounds.set_y(origin_above ? -page_height : page_height);
   return bounds;
 }
 
+void ContentsView::NotifyCustomLauncherPageAnimationChanged(double progress,
+                                                            int current_page,
+                                                            int target_page) {
+  int custom_launcher_page_index =
+      GetPageIndexForState(AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
+  if (custom_launcher_page_index == target_page) {
+    app_list_main_view_->view_delegate()->CustomLauncherPageAnimationChanged(
+        progress);
+  } else if (custom_launcher_page_index == current_page) {
+    app_list_main_view_->view_delegate()->CustomLauncherPageAnimationChanged(
+        1 - progress);
+  }
+}
+
 void ContentsView::UpdatePageBounds() {

[Matt Giuca, 2014/11/07 06:46:29]

I'm confused... I thought you were moving PaginationModel up into the
AppListMainView. Is that coming in another CL or were you able to avoid that?

I'm also confused because I thought the reason you had to move PaginationModel
to AppListMainView is that you would otherwise have to do a lot of work to
detach and re-attach the ContentsView when the profiles switch. I don't see any
such work here (nor does it seem necessary, if all you are doing is sending a
message to the AppListViewDelegate).

So is there no longer any need for such big refactorings, or are they coming
later? (If the former, I am pleasantly surprised.)

[calamity, 2014/11/10 03:38:30]

Avoided for now. This doesn't support observing anything other than the custom
launcher page animation. If we ever want that, we can either expand this or
revisit the refactor.

   // The bounds calculations will potentially be mid-transition (depending on
   // the state of the PaginationModel).
   int current_page = std::max(0, pagination_model_.selected_page());
   int target_page = current_page;
   double progress = 1;
   if (pagination_model_.has_transition()) {
     const PaginationModel::Transition& transition =
         pagination_model_.transition();
     if (pagination_model_.is_valid_page(transition.target_page)) {
       target_page = transition.target_page;
       progress = transition.progress;
     }
   }
 
+  NotifyCustomLauncherPageAnimationChanged(progress, current_page, target_page);
+
   // Move |current_page| from 0 to its origin. Move |target_page| from its
   // origin to 0.
   gfx::Rect on_screen(GetDefaultContentsBounds());
   gfx::Rect current_page_origin(GetOffscreenPageBounds(current_page));
   gfx::Rect target_page_origin(GetOffscreenPageBounds(target_page));
   gfx::Rect current_page_rect(
       gfx::Tween::RectValueBetween(progress, on_screen, current_page_origin));
   gfx::Rect target_page_rect(
       gfx::Tween::RectValueBetween(progress, target_page_origin, on_screen));
 
@@ skipping 117 matching lines @@
 }
 
 void ContentsView::TransitionStarted() {
 }
 
 void ContentsView::TransitionChanged() {
   UpdatePageBounds();
 }
 
 }  // namespace app_list