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

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

Issue 865163003: bookmarks: Move BookmarkNode into 'bookmarks' namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enhanced_bookmarks fix Created 5 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/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/mac/mac_util.h" 9 #include "base/mac/mac_util.h"
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
(...skipping 24 matching lines...) Expand all
35 #include "testing/platform_test.h" 35 #include "testing/platform_test.h"
36 #import "third_party/ocmock/OCMock/OCMock.h" 36 #import "third_party/ocmock/OCMock/OCMock.h"
37 #include "third_party/ocmock/gtest_support.h" 37 #include "third_party/ocmock/gtest_support.h"
38 #include "ui/base/cocoa/animation_utils.h" 38 #include "ui/base/cocoa/animation_utils.h"
39 #include "ui/base/theme_provider.h" 39 #include "ui/base/theme_provider.h"
40 #include "ui/events/test/cocoa_test_event_utils.h" 40 #include "ui/events/test/cocoa_test_event_utils.h"
41 #include "ui/gfx/image/image_skia.h" 41 #include "ui/gfx/image/image_skia.h"
42 42
43 using base::ASCIIToUTF16; 43 using base::ASCIIToUTF16;
44 using bookmarks::BookmarkModel; 44 using bookmarks::BookmarkModel;
45 using bookmarks::BookmarkNode;
45 46
46 // Unit tests don't need time-consuming asynchronous animations. 47 // Unit tests don't need time-consuming asynchronous animations.
47 @interface BookmarkBarControllerTestable : BookmarkBarController { 48 @interface BookmarkBarControllerTestable : BookmarkBarController {
48 } 49 }
49 50
50 @end 51 @end
51 52
52 @implementation BookmarkBarControllerTestable 53 @implementation BookmarkBarControllerTestable
53 54
54 - (id)initWithBrowser:(Browser*)browser 55 - (id)initWithBrowser:(Browser*)browser
(...skipping 2069 matching lines...) Expand 10 before | Expand all | Expand 10 after
2124 "2f3b ] 4b "); 2125 "2f3b ] 4b ");
2125 actual = bookmarks::test::ModelStringFromNode(root); 2126 actual = bookmarks::test::ModelStringFromNode(root);
2126 EXPECT_EQ(expected, actual); 2127 EXPECT_EQ(expected, actual);
2127 2128
2128 // Verify that the other bookmark folder can't be deleted. 2129 // Verify that the other bookmark folder can't be deleted.
2129 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; 2130 BookmarkButton *otherButton = [bar_ otherBookmarksButton];
2130 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); 2131 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]);
2131 } 2132 }
2132 2133
2133 } // namespace 2134 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698