AppModelBuilder to athena.

athena/home/home_card_impl.cc

 // Copyright 2014 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 "athena/home/public/home_card.h"
 
 #include "athena/home/app_list_view_delegate.h"
+#include "athena/home/public/app_model_builder.h"
 #include "athena/input/public/accelerator_manager.h"
 #include "athena/input/public/input_manager.h"
 #include "athena/screen/public/screen_manager.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/app_list/views/app_list_view.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/wm/core/visibility_controller.h"
 #include "ui/wm/core/window_animations.h"
 
@@ skipping 47 matching lines @@
     SetChildBoundsDirect(home_card, card_bounds);
   }
 
   aura::Window* container_;
 
   DISALLOW_COPY_AND_ASSIGN(HomeCardLayoutManager);
 };
 
 class HomeCardImpl : public HomeCard, public AcceleratorHandler {
  public:
-  HomeCardImpl();
+  HomeCardImpl(AppModelBuilder* model_builder);

[oshima, 2014/06/09 22:24:38]

explicit

[Jun Mukai, 2014/06/09 22:35:25]

Done.

   virtual ~HomeCardImpl();
 
   void Init();
 
  private:
   enum Command {
     COMMAND_SHOW_HOME_CARD,
   };
   void InstallAccelerators();
 
   // AcceleratorHandler:
   virtual bool IsCommandEnabled(int command_id) const OVERRIDE { return true; }
   virtual bool OnAcceleratorFired(int command_id,
                                   const ui::Accelerator& accelerator) OVERRIDE {
     DCHECK_EQ(COMMAND_SHOW_HOME_CARD, command_id);
     home_card_widget_->Show();
     return true;
   }
 
+  scoped_ptr<AppModelBuilder> model_builder_;
+
   views::Widget* home_card_widget_;
 
   DISALLOW_COPY_AND_ASSIGN(HomeCardImpl);
 };
 
-HomeCardImpl::HomeCardImpl()
-  : home_card_widget_(NULL) {
+HomeCardImpl::HomeCardImpl(AppModelBuilder* model_builder)
+    : model_builder_(model_builder),
+      home_card_widget_(NULL) {
   DCHECK(!instance);
   instance = this;
 }
 
 HomeCardImpl::~HomeCardImpl() {
   DCHECK(instance);
   home_card_widget_->CloseNow();
   instance = NULL;
 }
 
 void HomeCardImpl::Init() {
   InstallAccelerators();
 
   aura::Window* container =
       ScreenManager::Get()->CreateContainer("HomeCardContainer");
   container->SetLayoutManager(new HomeCardLayoutManager(container));
   wm::SetChildWindowVisibilityChangesAnimated(container);
 
   app_list::AppListView* view = new app_list::AppListView(
-      new AppListViewDelegate);
+      new AppListViewDelegate(model_builder_.get()));
   view->InitAsBubbleAtFixedLocation(
       container,
       0 /* initial_apps_page */,
       gfx::Point(),
       views::BubbleBorder::FLOAT,
       true /* border_accepts_events */);
   home_card_widget_ = view->GetWidget();
   view->ShowWhenReady();
 }
 
 void HomeCardImpl::InstallAccelerators() {
   const AcceleratorData accelerator_data[] = {
       {TRIGGER_ON_PRESS, ui::VKEY_L, ui::EF_CONTROL_DOWN,
        COMMAND_SHOW_HOME_CARD, AF_NONE},
   };
   InputManager::Get()->GetAcceleratorManager()->RegisterAccelerators(
       accelerator_data, arraysize(accelerator_data), this);
 }
 
 }  // namespace
 
 // static
-HomeCard* HomeCard::Create() {
-  (new HomeCardImpl())->Init();
+HomeCard* HomeCard::Create(AppModelBuilder* model_builder) {
+  (new HomeCardImpl(model_builder))->Init();
   DCHECK(instance);
   return instance;
 }
 
 // static
 void HomeCard::Shutdown() {
   DCHECK(instance);
   delete instance;
   instance = NULL;
 }
 
 }  // namespace athena