Refactor app list so AppsGridView owns the PaginationModel.

ui/app_list/views/app_list_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/app_list_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "base/win/windows_version.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_view_delegate.h"
-#include "ui/app_list/pagination_model.h"
 #include "ui/app_list/signin_delegate.h"
 #include "ui/app_list/speech_ui_model.h"
 #include "ui/app_list/views/app_list_background.h"
 #include "ui/app_list/views/app_list_folder_view.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/app_list_view_observer.h"
 #include "ui/app_list/views/apps_container_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/app_list/views/signin_view.h"
@@ skipping 135 matching lines @@
 AppListView::~AppListView() {
   delegate_->GetSpeechUI()->RemoveObserver(this);
   delegate_->RemoveObserver(this);
   animation_observer_.reset();
   // Remove child views first to ensure no remaining dependencies on delegate_.
   RemoveAllChildViews(true);
 }
 
 void AppListView::InitAsBubbleAttachedToAnchor(
     gfx::NativeView parent,
-    PaginationModel* pagination_model,
     views::View* anchor,
     const gfx::Vector2d& anchor_offset,
     views::BubbleBorder::Arrow arrow,
     bool border_accepts_events) {
   SetAnchorView(anchor);
-  InitAsBubbleInternal(
-      parent, pagination_model, arrow, border_accepts_events, anchor_offset);
+  InitAsBubbleInternal(parent, arrow, border_accepts_events, anchor_offset);
 }
 
 void AppListView::InitAsBubbleAtFixedLocation(
     gfx::NativeView parent,
-    PaginationModel* pagination_model,
     const gfx::Point& anchor_point_in_screen,
     views::BubbleBorder::Arrow arrow,
     bool border_accepts_events) {
   SetAnchorView(NULL);
   SetAnchorRect(gfx::Rect(anchor_point_in_screen, gfx::Size()));
-  InitAsBubbleInternal(
-      parent, pagination_model, arrow, border_accepts_events, gfx::Vector2d());
+  InitAsBubbleInternal(parent, arrow, border_accepts_events, gfx::Vector2d());
 }
 
 void AppListView::SetBubbleArrow(views::BubbleBorder::Arrow arrow) {
   GetBubbleFrameView()->bubble_border()->set_arrow(arrow);
   SizeToContents();  // Recalcuates with new border.
   GetBubbleFrameView()->SchedulePaint();
 }
 
 void AppListView::SetAnchorPoint(const gfx::Point& anchor_point) {
   SetAnchorRect(gfx::Rect(anchor_point, gfx::Size()));
@@ skipping 85 matching lines @@
 #if defined(USE_AURA)
   gfx::NativeWindow window =
       GetWidget()->GetTopLevelWidget()->GetNativeWindow();
   return window->GetHost()->GetAcceleratedWidget();
 #else
   return GetWidget()->GetTopLevelWidget()->GetNativeWindow();
 #endif
 }
 #endif
 
+PaginationModel* AppListView::GetAppsPaginationModel() {
+  return app_list_main_view_->contents_view()
+      ->apps_container_view()
+      ->apps_grid_view()
+      ->pagination_model();

[xiyuan, 2014/06/02 17:02:08]

This repeats many times. Why not moving relevant GetAppsPaginationModel in
AppListMainView/ContentsView to public and call them?

[Matt Giuca, 2014/06/03 01:52:36]

I really don't want to expose GetAppsPaginationModel at all of the intermediate
layers. I am planning to remove the dependency of AppListMainView and
ContentsView on PaginationModel -- the main point of this CL is to have as few
classes depend on PaginationModel as possible (which is why I was reluctant to
add this getter in AppListView in the first place).

I think it's cleaner to use the existing getters to reach down and pull out the
PaginationModel than it is to expose a PaginationModel at each level.

+}
+
 void AppListView::InitAsBubbleInternal(gfx::NativeView parent,
-                                       PaginationModel* pagination_model,
                                        views::BubbleBorder::Arrow arrow,
                                        bool border_accepts_events,
                                        const gfx::Vector2d& anchor_offset) {
-  app_list_main_view_ = new AppListMainView(delegate_.get(),
-                                            pagination_model,
-                                            parent);
+  app_list_main_view_ = new AppListMainView(delegate_.get(), parent);
   AddChildView(app_list_main_view_);
 #if defined(USE_AURA)
   app_list_main_view_->SetPaintToLayer(true);
   app_list_main_view_->SetFillsBoundsOpaquely(false);
   app_list_main_view_->layer()->SetMasksToBounds(true);
 #endif
 
   signin_view_ =
       new SigninView(delegate_->GetSigninDelegate(),
                      app_list_main_view_->GetPreferredSize().width());
@@ skipping 248 matching lines @@
 #else
   speech_view_->SetVisible(recognizing);
   app_list_main_view_->SetVisible(!recognizing);
 
   // Needs to schedule paint of AppListView itself, to repaint the background.
   GetBubbleFrameView()->SchedulePaint();
 #endif
 }
 
 }  // namespace app_list