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

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

Issue 12550006: Mac: Add a shortcut to open the Apps page from the bookmark bar. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Minor typo. 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 unified diff | Download patch | Annotate | Revision Log
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 #include "base/memory/scoped_nsobject.h" 5 #include "base/memory/scoped_nsobject.h"
6 #include "base/string16.h" 6 #include "base/string16.h"
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/bookmarks/bookmark_model.h" 8 #include "chrome/browser/bookmarks/bookmark_model.h"
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 BookmarkModel* bookmark_model = 216 BookmarkModel* bookmark_model =
217 BookmarkModelFactory::GetForProfile(profile()); 217 BookmarkModelFactory::GetForProfile(profile());
218 const BookmarkNode* node = 218 const BookmarkNode* node =
219 bookmark_model->AddURL(bookmark_model->bookmark_bar_node(), 219 bookmark_model->AddURL(bookmark_model->bookmark_bar_node(),
220 0, 220 0,
221 ASCIIToUTF16("Test Bookmark"), 221 ASCIIToUTF16("Test Bookmark"),
222 GURL("http://www.exmaple.com")); 222 GURL("http://www.exmaple.com"));
223 223
224 scoped_nsobject<BookmarkButtonCell> button_cell( 224 scoped_nsobject<BookmarkButtonCell> button_cell(
225 [[BookmarkButtonCell buttonCellForNode:node 225 [[BookmarkButtonCell buttonCellForNode:node
226 menuController:nil 226 text:nil
227 cellText:nil 227 image:nil
228 cellImage:nil] retain]); 228 menuController:nil] retain]);
229 scoped_nsobject<BookmarkButton> dragged_button([[BookmarkButton alloc] init]); 229 scoped_nsobject<BookmarkButton> dragged_button([[BookmarkButton alloc] init]);
230 [dragged_button setCell:button_cell]; 230 [dragged_button setCell:button_cell];
231 [info setDraggingSource:dragged_button.get()]; 231 [info setDraggingSource:dragged_button.get()];
232 [info setDragDataType:kBookmarkButtonDragType]; 232 [info setDragDataType:kBookmarkButtonDragType];
233 [info setButton:dragged_button.get()]; 233 [info setButton:dragged_button.get()];
234 [info setBookmarkModel:bookmark_model]; 234 [info setBookmarkModel:bookmark_model];
235 EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove); 235 EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove);
236 EXPECT_TRUE([view_ performDragOperation:(id)info.get()]); 236 EXPECT_TRUE([view_ performDragOperation:(id)info.get()]);
237 EXPECT_TRUE([info dragButtonToPong]); 237 EXPECT_TRUE([info dragButtonToPong]);
238 EXPECT_FALSE([info dragButtonToShouldCopy]); 238 EXPECT_FALSE([info dragButtonToShouldCopy]);
(...skipping 17 matching lines...) Expand all
256 BookmarkModel* bookmark_model = 256 BookmarkModel* bookmark_model =
257 BookmarkModelFactory::GetForProfile(profile()); 257 BookmarkModelFactory::GetForProfile(profile());
258 const BookmarkNode* node = 258 const BookmarkNode* node =
259 bookmark_model->AddURL(bookmark_model->bookmark_bar_node(), 259 bookmark_model->AddURL(bookmark_model->bookmark_bar_node(),
260 0, 260 0,
261 ASCIIToUTF16("Test Bookmark"), 261 ASCIIToUTF16("Test Bookmark"),
262 GURL("http://www.exmaple.com")); 262 GURL("http://www.exmaple.com"));
263 263
264 scoped_nsobject<BookmarkButtonCell> button_cell( 264 scoped_nsobject<BookmarkButtonCell> button_cell(
265 [[BookmarkButtonCell buttonCellForNode:node 265 [[BookmarkButtonCell buttonCellForNode:node
266 menuController:nil 266 text:nil
267 cellText:nil 267 image:nil
268 cellImage:nil] retain]); 268 menuController:nil] retain]);
269 scoped_nsobject<BookmarkButton> dragged_button([[BookmarkButton alloc] init]); 269 scoped_nsobject<BookmarkButton> dragged_button([[BookmarkButton alloc] init]);
270 [dragged_button setCell:button_cell]; 270 [dragged_button setCell:button_cell];
271 [info setDraggingSource:dragged_button.get()]; 271 [info setDraggingSource:dragged_button.get()];
272 [info setDragDataType:kBookmarkButtonDragType]; 272 [info setDragDataType:kBookmarkButtonDragType];
273 [info setButton:dragged_button.get()]; 273 [info setButton:dragged_button.get()];
274 [info setBookmarkModel:BookmarkModelFactory::GetForProfile(other_profile)]; 274 [info setBookmarkModel:BookmarkModelFactory::GetForProfile(other_profile)];
275 EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove); 275 EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove);
276 EXPECT_TRUE([view_ performDragOperation:(id)info.get()]); 276 EXPECT_TRUE([view_ performDragOperation:(id)info.get()]);
277 EXPECT_TRUE([info dragButtonToPong]); 277 EXPECT_TRUE([info dragButtonToPong]);
278 EXPECT_TRUE([info dragButtonToShouldCopy]); 278 EXPECT_TRUE([info dragButtonToShouldCopy]);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 EXPECT_TRUE([info draggingEnteredCalled]); // Ensure controller pinged. 312 EXPECT_TRUE([info draggingEnteredCalled]); // Ensure controller pinged.
313 EXPECT_TRUE([view_ dropIndicatorShown]); 313 EXPECT_TRUE([view_ dropIndicatorShown]);
314 EXPECT_EQ([view_ dropIndicatorPosition], kFakeIndicatorPos); 314 EXPECT_EQ([view_ dropIndicatorPosition], kFakeIndicatorPos);
315 315
316 [info setDropIndicatorShown:NO]; 316 [info setDropIndicatorShown:NO];
317 EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove); 317 EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove);
318 EXPECT_FALSE([view_ dropIndicatorShown]); 318 EXPECT_FALSE([view_ dropIndicatorShown]);
319 } 319 }
320 320
321 } // namespace 321 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698