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

Unified Diff: ui/app_list/cocoa/app_list_window_controller_unittest.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 | « ui/app_list/cocoa/app_list_window_controller.mm ('k') | ui/app_list/cocoa/apps_grid_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/cocoa/app_list_window_controller_unittest.mm
diff --git a/ui/app_list/cocoa/app_list_window_controller_unittest.mm b/ui/app_list/cocoa/app_list_window_controller_unittest.mm
index bb78cde1f0ad28a4e6d4a6e43b6e17327e573244..8169f647d8b44a7502a3761a7dba21a4d4af3f58 100644
--- a/ui/app_list/cocoa/app_list_window_controller_unittest.mm
+++ b/ui/app_list/cocoa/app_list_window_controller_unittest.mm
@@ -5,7 +5,7 @@
#import "base/memory/scoped_nsobject.h"
#import "testing/gtest_mac.h"
#include "ui/app_list/app_list_view_delegate.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"
#include "ui/app_list/test/app_list_test_view_delegate.h"
#import "ui/base/test/ui_cocoa_test_helper.h"
@@ -23,7 +23,7 @@ class AppListWindowControllerTest : public ui::CocoaTest {
app_list::test::AppListTestViewDelegate* delegate() {
return static_cast<app_list::test::AppListTestViewDelegate*>(
- [[controller_ appsGridController] delegate]);
+ [[controller_ appListViewController] delegate]);
}
private:
@@ -34,10 +34,8 @@ AppListWindowControllerTest::AppListWindowControllerTest() {
Init();
scoped_ptr<app_list::AppListViewDelegate> delegate(
new app_list::test::AppListTestViewDelegate);
- scoped_nsobject<AppsGridController> content(
- [[AppsGridController alloc] initWithViewDelegate:delegate.Pass()]);
- controller_.reset(
- [[AppListWindowController alloc] initWithGridController:content]);
+ controller_.reset([[AppListWindowController alloc] init]);
+ [[controller_ appListViewController] setDelegate:delegate.Pass()];
}
void AppListWindowControllerTest::TearDown() {
« no previous file with comments | « ui/app_list/cocoa/app_list_window_controller.mm ('k') | ui/app_list/cocoa/apps_grid_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698