Index: chrome/browser/ui/views/app_list/app_list_controller_win.cc |
diff --git a/chrome/browser/ui/views/app_list/app_list_controller_win.cc b/chrome/browser/ui/views/app_list/app_list_controller_win.cc |
index 6c8e55167b9fa772429ff00ed5d6c785ae01a7b6..5d93f3fbbcba61c3c84af43489a3f7cadb16c8f1 100644 |
--- a/chrome/browser/ui/views/app_list/app_list_controller_win.cc |
+++ b/chrome/browser/ui/views/app_list/app_list_controller_win.cc |
@@ -568,6 +568,8 @@ class AppListViewWin { |
window_icon_updated_(false) { |
} |
+ app_list::AppListView* view() { return view_; } |
+ |
void Show() { |
view_->GetWidget()->Show(); |
if (!window_icon_updated_) { |
@@ -699,6 +701,12 @@ class AppListShower { |
return view_->GetWindow(); |
} |
+ app_list::AppListModel* GetGurrentModel() { |
+ if (!view_) |
+ return NULL; |
+ return view_->view()->model(); |
+ } |
+ |
void OnSigninStatusChanged() { |
if (view_) |
view_->OnSigninStatusChanged(); |
@@ -790,7 +798,7 @@ class AppListShower { |
// TODO(tapted): Rename this class to AppListServiceWin and move entire file to |
// chrome/browser/ui/app_list/app_list_service_win.cc after removing |
// chrome/browser/ui/views dependency. |
-class AppListController : public AppListServiceImpl { |
+class AppListController : public AppListServiceWin { |
public: |
virtual ~AppListController(); |
@@ -820,6 +828,9 @@ class AppListController : public AppListServiceImpl { |
// AppListServiceImpl overrides: |
virtual void CreateShortcut() OVERRIDE; |
+ // AppListServiceWin overrides: |
+ virtual app_list::AppListModel* GetAppListModelForTesting() OVERRIDE; |
+ |
private: |
friend struct DefaultSingletonTraits<AppListController>; |
@@ -939,6 +950,10 @@ AppListControllerDelegate* AppListController::CreateControllerDelegate() { |
return new AppListControllerDelegateWin(); |
} |
+app_list::AppListModel* AppListController::GetAppListModelForTesting() { |
+ return shower_->GetGurrentModel(); |
+} |
+ |
void AppListController::ShowForProfile(Profile* requested_profile) { |
DCHECK(requested_profile); |
if (requested_profile->IsManaged()) |