| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/memory/scoped_nsobject.h" | 8 #include "base/memory/scoped_nsobject.h" |
| 9 #include "base/string16.h" |
| 9 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| 10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h" | 11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h" |
| 11 #include "chrome/browser/ui/cocoa/browser_window_controller.h" | 12 #include "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 12 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" | 13 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" |
| 13 #import "chrome/browser/ui/cocoa/info_bubble_window.h" | 14 #import "chrome/browser/ui/cocoa/info_bubble_window.h" |
| 14 #include "content/public/browser/notification_service.h" | 15 #include "content/public/browser/notification_service.h" |
| 15 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
| 16 #import "testing/gtest_mac.h" | 17 #import "testing/gtest_mac.h" |
| 17 #include "testing/platform_test.h" | 18 #include "testing/platform_test.h" |
| 18 | 19 |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 TEST_F(BookmarkBubbleControllerTest, TestFolderWithBlankName) { | 186 TEST_F(BookmarkBubbleControllerTest, TestFolderWithBlankName) { |
| 186 // Create some folders, including a nested folder | 187 // Create some folders, including a nested folder |
| 187 BookmarkModel* model = GetBookmarkModel(); | 188 BookmarkModel* model = GetBookmarkModel(); |
| 188 EXPECT_TRUE(model); | 189 EXPECT_TRUE(model); |
| 189 const BookmarkNode* bookmarkBarNode = model->bookmark_bar_node(); | 190 const BookmarkNode* bookmarkBarNode = model->bookmark_bar_node(); |
| 190 EXPECT_TRUE(bookmarkBarNode); | 191 EXPECT_TRUE(bookmarkBarNode); |
| 191 const BookmarkNode* node1 = model->AddFolder(bookmarkBarNode, 0, | 192 const BookmarkNode* node1 = model->AddFolder(bookmarkBarNode, 0, |
| 192 ASCIIToUTF16("one")); | 193 ASCIIToUTF16("one")); |
| 193 EXPECT_TRUE(node1); | 194 EXPECT_TRUE(node1); |
| 194 const BookmarkNode* node2 = model->AddFolder(bookmarkBarNode, 1, | 195 const BookmarkNode* node2 = model->AddFolder(bookmarkBarNode, 1, |
| 195 ASCIIToUTF16("")); | 196 string16()); |
| 196 EXPECT_TRUE(node2); | 197 EXPECT_TRUE(node2); |
| 197 const BookmarkNode* node3 = model->AddFolder(bookmarkBarNode, 2, | 198 const BookmarkNode* node3 = model->AddFolder(bookmarkBarNode, 2, |
| 198 ASCIIToUTF16("three")); | 199 ASCIIToUTF16("three")); |
| 199 EXPECT_TRUE(node3); | 200 EXPECT_TRUE(node3); |
| 200 const BookmarkNode* node2_1 = model->AddURL(node2, 0, ASCIIToUTF16("title1"), | 201 const BookmarkNode* node2_1 = model->AddURL(node2, 0, ASCIIToUTF16("title1"), |
| 201 GURL("http://www.google.com")); | 202 GURL("http://www.google.com")); |
| 202 EXPECT_TRUE(node2_1); | 203 EXPECT_TRUE(node2_1); |
| 203 | 204 |
| 204 BookmarkBubbleController* controller = ControllerForNode(node1); | 205 BookmarkBubbleController* controller = ControllerForNode(node1); |
| 205 EXPECT_TRUE(controller); | 206 EXPECT_TRUE(controller); |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 489 // Normally this would be sent up the responder tree correctly, but since | 490 // Normally this would be sent up the responder tree correctly, but since |
| 490 // tests run in the background, key window and main window are never set on | 491 // tests run in the background, key window and main window are never set on |
| 491 // NSApplication. Adding it to NSApplication directly removes the need for | 492 // NSApplication. Adding it to NSApplication directly removes the need for |
| 492 // worrying about what the current window with focus is. | 493 // worrying about what the current window with focus is. |
| 493 - (void)editBookmarkNode:(id)sender { | 494 - (void)editBookmarkNode:(id)sender { |
| 494 EXPECT_TRUE([sender respondsToSelector:@selector(node)]); | 495 EXPECT_TRUE([sender respondsToSelector:@selector(node)]); |
| 495 BookmarkBubbleControllerTest::edits_++; | 496 BookmarkBubbleControllerTest::edits_++; |
| 496 } | 497 } |
| 497 | 498 |
| 498 @end | 499 @end |
| OLD | NEW |