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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm

Issue 2685333005: ash: fix regression where ctrl+n put new window on wrong desktop (Closed)
Patch Set: Rebase to ToT Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/strings/sys_string_conversions.h" 7 #include "base/strings/sys_string_conversions.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" 10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 EXPECT_TRUE([controller_ window]); 95 EXPECT_TRUE([controller_ window]);
96 [controller_ runAsModalSheet]; 96 [controller_ runAsModalSheet];
97 } 97 }
98 98
99 void TearDown() override { 99 void TearDown() override {
100 controller_ = NULL; 100 controller_ = NULL;
101 CocoaTest::TearDown(); 101 CocoaTest::TearDown();
102 } 102 }
103 103
104 Browser* CreateBrowser() override { 104 Browser* CreateBrowser() override {
105 Browser::CreateParams params(profile()); 105 Browser::CreateParams params(profile(), true);
106 return chrome::CreateBrowserWithTestWindowForParams(&params).release(); 106 return chrome::CreateBrowserWithTestWindowForParams(&params).release();
107 } 107 }
108 }; 108 };
109 109
110 TEST_F(BookmarkEditorBaseControllerTest, VerifyBookmarkTestModel) { 110 TEST_F(BookmarkEditorBaseControllerTest, VerifyBookmarkTestModel) {
111 BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile()); 111 BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
112 const BookmarkNode* root = model->bookmark_bar_node(); 112 const BookmarkNode* root = model->bookmark_bar_node();
113 EXPECT_EQ(4, root->child_count()); 113 EXPECT_EQ(4, root->child_count());
114 // a 114 // a
115 const BookmarkNode* child = root->GetChild(0); 115 const BookmarkNode* child = root->GetChild(0);
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 reinterpret_cast<const BookmarkNode*>(&children); 272 reinterpret_cast<const BookmarkNode*>(&children);
273 BookmarkFolderInfo* info = 273 BookmarkFolderInfo* info =
274 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name" 274 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name"
275 folderNode:fakeNode 275 folderNode:fakeNode
276 children:children]; 276 children:children];
277 EXPECT_TRUE(info); 277 EXPECT_TRUE(info);
278 EXPECT_EQ([info folderName], @"name"); 278 EXPECT_EQ([info folderName], @"name");
279 EXPECT_EQ([info children], children); 279 EXPECT_EQ([info children], children);
280 EXPECT_EQ([info folderNode], fakeNode); 280 EXPECT_EQ([info folderNode], fakeNode);
281 } 281 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698