Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(519)

Unified Diff: chrome/browser/ui/cocoa/app_list/app_list_controller_cocoa.mm

Issue 12701022: wrongbaseurl OSX App List Pager and root view controller. (Closed) Base URL: http://git.chromium.org/chromium/src.git@20130304-crbug-138633-osx-app-list-demo-polish-macbook
Patch Set: delegate should be owned by viewcontroller, test coverage Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/app_list/app_list.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « no previous file | ui/app_list/app_list.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698