| Index: athena/home/public/home_card.h
|
| diff --git a/athena/home/public/home_card.h b/athena/home/public/home_card.h
|
| index 5f3c1b2345c9ac7ed8dc5e23f729ed3e0638dbcb..47151190426138b26e8975c80f126117aa4dd071 100644
|
| --- a/athena/home/public/home_card.h
|
| +++ b/athena/home/public/home_card.h
|
| @@ -6,10 +6,7 @@
|
| #define ATHENA_HOME_PUBLIC_HOME_CARD_H_
|
|
|
| #include "athena/athena_export.h"
|
| -
|
| -namespace app_list {
|
| -class SearchProvider;
|
| -}
|
| +#include "base/memory/scoped_ptr.h"
|
|
|
| namespace gfx {
|
| class Rect;
|
| @@ -17,6 +14,7 @@ class Rect;
|
|
|
| namespace athena {
|
| class AppModelBuilder;
|
| +class SearchControllerFactory;
|
|
|
| class ATHENA_EXPORT HomeCard {
|
| public:
|
| @@ -38,7 +36,8 @@ class ATHENA_EXPORT HomeCard {
|
|
|
| // Creates/deletes/gets the singleton object of the HomeCard
|
| // implementation. Takes the ownership of |model_builder|.
|
| - static HomeCard* Create(AppModelBuilder* model_builder);
|
| + static HomeCard* Create(scoped_ptr<AppModelBuilder> model_builder,
|
| + scoped_ptr<SearchControllerFactory> search_factory);
|
| static void Shutdown();
|
| static HomeCard* Get();
|
|
|
| @@ -48,11 +47,6 @@ class ATHENA_EXPORT HomeCard {
|
| virtual void SetState(State state) = 0;
|
| virtual State GetState() = 0;
|
|
|
| - // Registers a search_provider to the HomeCard. Receiver will take
|
| - // the ownership of the specified provider.
|
| - virtual void RegisterSearchProvider(
|
| - app_list::SearchProvider* search_provider) = 0;
|
| -
|
| // Called when the virtual keyboard changed has changed to |bounds|. An empty
|
| // |bounds| indicates that the virtual keyboard is not visible anymore.
|
| virtual void UpdateVirtualKeyboardBounds(
|
|
|