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

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

Issue 2407343002: cocoa browser: fix meaning of "continuous pulsing" (Closed)
Patch Set: setIsContinuousPulsing -> setPulseIsStuckOn Created 4 years, 2 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 #include <stddef.h> 6 #include <stddef.h>
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
(...skipping 2099 matching lines...) Expand 10 before | Expand all | Expand 10 after
2110 } 2110 }
2111 2111
2112 TEST_F(BookmarkBarControllerDragDropTest, PulseButton) { 2112 TEST_F(BookmarkBarControllerDragDropTest, PulseButton) {
2113 BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile()); 2113 BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
2114 const BookmarkNode* root = model->bookmark_bar_node(); 2114 const BookmarkNode* root = model->bookmark_bar_node();
2115 GURL gurl("http://www.google.com"); 2115 GURL gurl("http://www.google.com");
2116 const BookmarkNode* node = model->AddURL(root, root->child_count(), 2116 const BookmarkNode* node = model->AddURL(root, root->child_count(),
2117 ASCIIToUTF16("title"), gurl); 2117 ASCIIToUTF16("title"), gurl);
2118 2118
2119 BookmarkButton* button = [[bar_ buttons] objectAtIndex:0]; 2119 BookmarkButton* button = [[bar_ buttons] objectAtIndex:0];
2120 EXPECT_FALSE([button isContinuousPulsing]); 2120 EXPECT_FALSE([button isPulseStuckOn]);
2121 [bar_ startPulsingBookmarkNode:node]; 2121 [bar_ startPulsingBookmarkNode:node];
2122 EXPECT_TRUE([button isContinuousPulsing]); 2122 EXPECT_TRUE([button isPulseStuckOn]);
2123 [bar_ stopPulsingBookmarkNode]; 2123 [bar_ stopPulsingBookmarkNode];
2124 EXPECT_FALSE([button isContinuousPulsing]); 2124 EXPECT_FALSE([button isPulseStuckOn]);
2125 2125
2126 // Pulsing a node within a folder should pulse the folder button. 2126 // Pulsing a node within a folder should pulse the folder button.
2127 const BookmarkNode* folder = 2127 const BookmarkNode* folder =
2128 model->AddFolder(root, root->child_count(), ASCIIToUTF16("folder")); 2128 model->AddFolder(root, root->child_count(), ASCIIToUTF16("folder"));
2129 const BookmarkNode* inner = 2129 const BookmarkNode* inner =
2130 model->AddURL(folder, folder->child_count(), ASCIIToUTF16("inner"), gurl); 2130 model->AddURL(folder, folder->child_count(), ASCIIToUTF16("inner"), gurl);
2131 2131
2132 BookmarkButton* folder_button = [[bar_ buttons] objectAtIndex:1]; 2132 BookmarkButton* folder_button = [[bar_ buttons] objectAtIndex:1];
2133 EXPECT_FALSE([folder_button isContinuousPulsing]); 2133 EXPECT_FALSE([folder_button isPulseStuckOn]);
2134 [bar_ startPulsingBookmarkNode:inner]; 2134 [bar_ startPulsingBookmarkNode:inner];
2135 EXPECT_TRUE([folder_button isContinuousPulsing]); 2135 EXPECT_TRUE([folder_button isPulseStuckOn]);
2136 [bar_ stopPulsingBookmarkNode]; 2136 [bar_ stopPulsingBookmarkNode];
2137 EXPECT_FALSE([folder_button isContinuousPulsing]); 2137 EXPECT_FALSE([folder_button isPulseStuckOn]);
2138 2138
2139 // Stop pulsing if the node moved. 2139 // Stop pulsing if the node moved.
2140 [bar_ startPulsingBookmarkNode:inner]; 2140 [bar_ startPulsingBookmarkNode:inner];
2141 EXPECT_TRUE([folder_button isContinuousPulsing]); 2141 EXPECT_TRUE([folder_button isPulseStuckOn]);
2142 const BookmarkNode* folder2 = 2142 const BookmarkNode* folder2 =
2143 model->AddFolder(root, root->child_count(), ASCIIToUTF16("folder2")); 2143 model->AddFolder(root, root->child_count(), ASCIIToUTF16("folder2"));
2144 model->Move(inner, folder2, 0); 2144 model->Move(inner, folder2, 0);
2145 EXPECT_FALSE([folder_button isContinuousPulsing]); 2145 EXPECT_FALSE([folder_button isPulseStuckOn]);
2146 2146
2147 // Removing a pulsing folder is allowed. 2147 // Removing a pulsing folder is allowed.
2148 [bar_ startPulsingBookmarkNode:inner]; 2148 [bar_ startPulsingBookmarkNode:inner];
2149 BookmarkButton* folder2_button = [[bar_ buttons] objectAtIndex:2]; 2149 BookmarkButton* folder2_button = [[bar_ buttons] objectAtIndex:2];
2150 EXPECT_TRUE([folder2_button isContinuousPulsing]); 2150 EXPECT_TRUE([folder2_button isPulseStuckOn]);
2151 model->Remove(folder2); 2151 model->Remove(folder2);
2152 EXPECT_FALSE([folder2_button isContinuousPulsing]); 2152 EXPECT_FALSE([folder2_button isPulseStuckOn]);
2153 [bar_ stopPulsingBookmarkNode]; // Should not crash. 2153 [bar_ stopPulsingBookmarkNode]; // Should not crash.
2154 } 2154 }
2155 2155
2156 TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkDataToTrash) { 2156 TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkDataToTrash) {
2157 BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile()); 2157 BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
2158 const BookmarkNode* root = model->bookmark_bar_node(); 2158 const BookmarkNode* root = model->bookmark_bar_node();
2159 const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] " 2159 const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
2160 "2f3b ] 3b 4b "); 2160 "2f3b ] 3b 4b ");
2161 bookmarks::test::AddNodesFromModelString(model, root, model_string); 2161 bookmarks::test::AddNodesFromModelString(model, root, model_string);
2162 2162
(...skipping 17 matching lines...) Expand all
2180 "2f3b ] 4b "); 2180 "2f3b ] 4b ");
2181 actual = bookmarks::test::ModelStringFromNode(root); 2181 actual = bookmarks::test::ModelStringFromNode(root);
2182 EXPECT_EQ(expected, actual); 2182 EXPECT_EQ(expected, actual);
2183 2183
2184 // Verify that the other bookmark folder can't be deleted. 2184 // Verify that the other bookmark folder can't be deleted.
2185 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; 2185 BookmarkButton *otherButton = [bar_ otherBookmarksButton];
2186 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); 2186 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]);
2187 } 2187 }
2188 2188
2189 } // namespace 2189 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698