| Index: chrome/browser/ui/cocoa/app_list/app_list_controller_cocoa.mm
|
| diff --git a/chrome/browser/ui/cocoa/app_list/app_list_controller_cocoa.mm b/chrome/browser/ui/cocoa/app_list/app_list_controller_cocoa.mm
|
| index 110c3ec00f21bcfcd7bd63a138cb48f7e5891f6c..b5d3114685672f598390d159ecab8d3e003f3447 100644
|
| --- a/chrome/browser/ui/cocoa/app_list/app_list_controller_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/app_list/app_list_controller_cocoa.mm
|
| @@ -12,7 +12,7 @@
|
| #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
|
| #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
|
| #include "chrome/browser/ui/extensions/application_launch.h"
|
| -#import "ui/app_list/cocoa/apps_grid_controller.h"
|
| +#import "ui/app_list/cocoa/app_list_view_controller.h"
|
| #import "ui/app_list/cocoa/app_list_window_controller.h"
|
|
|
| namespace gfx {
|
| @@ -108,10 +108,8 @@ void AppListControllerDelegateCocoa::LaunchApp(
|
| void AppListControllerCocoa::CreateAppList(Profile* profile) {
|
| scoped_ptr<app_list::AppListViewDelegate> delegate(
|
| new AppListViewDelegate(new AppListControllerDelegateCocoa(), profile));
|
| - scoped_nsobject<AppsGridController> content(
|
| - [[AppsGridController alloc] initWithViewDelegate:delegate.Pass()]);
|
| - window_controller_.reset(
|
| - [[AppListWindowController alloc] initWithGridController:content]);
|
| + window_controller_.reset([[AppListWindowController alloc] init]);
|
| + [[window_controller_ appListViewController] setDelegate:delegate.Pass()];
|
| }
|
|
|
| void AppListControllerCocoa::ShowAppList(Profile* profile) {
|
|
|