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

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

Issue 7067046: Fix up stupid mistake caused by last minute change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "base/memory/scoped_nsobject.h" 5 #include "base/memory/scoped_nsobject.h"
6 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h" 6 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
7 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h" 7 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h"
8 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" 8 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
9 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h" 9 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
10 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" 10 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
11 #import "chrome/browser/ui/cocoa/url_drop_target.h" 11 #import "chrome/browser/ui/cocoa/url_drop_target.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 #include "testing/platform_test.h" 13 #include "testing/platform_test.h"
14 #import "third_party/mozilla/NSPasteboard+Utils.h" 14 #import "third_party/mozilla/NSPasteboard+Utils.h"
15 #import "third_party/ocmock/OCMock/OCMock.h" 15 #import "third_party/ocmock/OCMock/OCMock.h"
16 #import "third_party/ocmock/ocmock_extensions.h" 16 #import "third_party/ocmock/ocmock_extensions.h"
17 17
18 // Allows us to verify BookmarkBarFolderView. 18 // Allows us to verify BookmarkBarFolderView.
19 @interface BookmarkBarFolderView(TestingAPI) 19 @interface BookmarkBarFolderView(TestingAPI)
20 20
21 @property(readonly, nonatomic) BOOL dropIndicatorShown; 21 @property(readonly, nonatomic) BOOL dropIndicatorShown;
22 @property(readonly, nonatomic) CGFloat dropIndicatorPosition; 22 @property(readonly, nonatomic) CGFloat dropIndicatorPosition;
23 @property(assign, nonatomic) id<BookmarkButtonControllerProtocol> controller; 23
24 -(void)setController:(id<BookmarkButtonControllerProtocol>)controller;
24 25
25 @end 26 @end
26 27
27 @implementation BookmarkBarFolderView(TestingAPI) 28 @implementation BookmarkBarFolderView(TestingAPI)
28 29
29 -(void)setController:(id<BookmarkButtonControllerProtocol>)controller { 30 -(void)setController:(id<BookmarkButtonControllerProtocol>)controller {
30 controller_ = controller; 31 controller_ = controller;
31 } 32 }
32 33
33 -(BOOL)dropIndicatorShown { 34 -(BOOL)dropIndicatorShown {
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 EXPECT_EQ([view_ dropIndicatorPosition], kFakeIndicatorPos); 142 EXPECT_EQ([view_ dropIndicatorPosition], kFakeIndicatorPos);
142 mock_controller_.reset([GetMockController(NO) retain]); 143 mock_controller_.reset([GetMockController(NO) retain]);
143 [view_ setController:mock_controller_]; 144 [view_ setController:mock_controller_];
144 [[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone] 145 [[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone]
145 draggingEntered:drag_info]; 146 draggingEntered:drag_info];
146 EXPECT_EQ([view_ draggingEntered:drag_info], NSDragOperationMove); 147 EXPECT_EQ([view_ draggingEntered:drag_info], NSDragOperationMove);
147 EXPECT_FALSE([view_ dropIndicatorShown]); 148 EXPECT_FALSE([view_ dropIndicatorShown]);
148 } 149 }
149 150
150 } // namespace 151 } // namespace
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698