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

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

Issue 2014733003: Removing parsing of text from pasteboard. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compilation fix Created 4 years, 6 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 #include "base/mac/scoped_nsobject.h" 5 #include "base/mac/scoped_nsobject.h"
6 #include "base/strings/string16.h" 6 #include "base/strings/string16.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h" 10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 if ([dataType isEqualToString:ui::ClipboardUtil::UTIForPasteboardType( 84 if ([dataType isEqualToString:ui::ClipboardUtil::UTIForPasteboardType(
85 kBookmarkButtonDragType)]) { 85 kBookmarkButtonDragType)]) {
86 BookmarkButton* button = mock_button_.get(); 86 BookmarkButton* button = mock_button_.get();
87 [[[pasteboard stub] 87 [[[pasteboard stub]
88 andReturn:[NSData dataWithBytes:&button length:sizeof(button)]] 88 andReturn:[NSData dataWithBytes:&button length:sizeof(button)]]
89 dataForType:dataType]; 89 dataForType:dataType];
90 } else { 90 } else {
91 [[[pasteboard stub] andReturn:[NSData data]] dataForType:dataType]; 91 [[[pasteboard stub] andReturn:[NSData data]] dataForType:dataType];
92 } 92 }
93 [[[pasteboard stub] andReturn:nil] dataForType:OCMOCK_ANY]; 93 [[[pasteboard stub] andReturn:nil] dataForType:OCMOCK_ANY];
94 [[[pasteboard stub] andReturnBool:YES] containsURLData]; 94 [[[pasteboard stub] andReturnBool:YES]
95 containsURLDataConvertingTextToURL:YES];
95 [[pasteboard stub] getURLs:[OCMArg setTo:nil] 96 [[pasteboard stub] getURLs:[OCMArg setTo:nil]
96 andTitles:[OCMArg setTo:nil] 97 andTitles:[OCMArg setTo:nil]
97 convertingFilenames:YES]; 98 convertingFilenames:YES
99 convertingTextToURL:YES];
98 return pasteboard; 100 return pasteboard;
99 } 101 }
100 102
101 id GetFakeDragInfoForType(NSString* dataType) { 103 id GetFakeDragInfoForType(NSString* dataType) {
102 // Need something non-nil to return as the draggingSource. 104 // Need something non-nil to return as the draggingSource.
103 id source = [OCMockObject mockForClass:[NSObject class]]; 105 id source = [OCMockObject mockForClass:[NSObject class]];
104 id drag_info = [OCMockObject mockForProtocol:@protocol(NSDraggingInfo)]; 106 id drag_info = [OCMockObject mockForProtocol:@protocol(NSDraggingInfo)];
105 id pasteboard = GetFakePasteboardForType(dataType); 107 id pasteboard = GetFakePasteboardForType(dataType);
106 [[[drag_info stub] andReturn:pasteboard] draggingPasteboard]; 108 [[[drag_info stub] andReturn:pasteboard] draggingPasteboard];
107 [[[drag_info stub] andReturnNSPoint:kPoint] draggingLocation]; 109 [[[drag_info stub] andReturnNSPoint:kPoint] draggingLocation];
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 mock_controller_.reset(GetMockController( 214 mock_controller_.reset(GetMockController(
213 NO, BookmarkModelFactory::GetForProfile(profile()))); 215 NO, BookmarkModelFactory::GetForProfile(profile())));
214 [view_ setController:mock_controller_]; 216 [view_ setController:mock_controller_];
215 [[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone] 217 [[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone]
216 draggingEntered:drag_info]; 218 draggingEntered:drag_info];
217 EXPECT_EQ([view_ draggingEntered:drag_info], NSDragOperationMove); 219 EXPECT_EQ([view_ draggingEntered:drag_info], NSDragOperationMove);
218 EXPECT_FALSE([view_ dropIndicatorShown]); 220 EXPECT_FALSE([view_ dropIndicatorShown]);
219 } 221 }
220 222
221 } // namespace 223 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698