| OLD | NEW |
| 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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 const override { | 228 const override { |
| 229 return NULL; | 229 return NULL; |
| 230 } | 230 } |
| 231 bool InIncognitoMode() const override { return false; } | 231 bool InIncognitoMode() const override { return false; } |
| 232 bool HasCustomColor(int id) const override { return false; } | 232 bool HasCustomColor(int id) const override { return false; } |
| 233 NSImage* GetNSImageNamed(int id) const override { return nil; } | 233 NSImage* GetNSImageNamed(int id) const override { return nil; } |
| 234 NSColor* GetNSImageColorNamed(int id) const override { return nil; } | 234 NSColor* GetNSImageColorNamed(int id) const override { return nil; } |
| 235 NSColor* GetNSColor(int id) const override { return color_.get(); } | 235 NSColor* GetNSColor(int id) const override { return color_.get(); } |
| 236 NSColor* GetNSColorTint(int id) const override { return nil; } | 236 NSColor* GetNSColorTint(int id) const override { return nil; } |
| 237 NSGradient* GetNSGradient(int id) const override { return nil; } | 237 NSGradient* GetNSGradient(int id) const override { return nil; } |
| 238 bool ShouldIncreaseContrast() const override { return false; } |
| 238 }; | 239 }; |
| 239 | 240 |
| 240 | 241 |
| 241 @interface FakeDragInfo : NSObject { | 242 @interface FakeDragInfo : NSObject { |
| 242 @public | 243 @public |
| 243 NSPoint dropLocation_; | 244 NSPoint dropLocation_; |
| 244 NSDragOperation sourceMask_; | 245 NSDragOperation sourceMask_; |
| 245 } | 246 } |
| 246 @property (nonatomic, assign) NSPoint dropLocation; | 247 @property (nonatomic, assign) NSPoint dropLocation; |
| 247 - (void)setDraggingSourceOperationMask:(NSDragOperation)mask; | 248 - (void)setDraggingSourceOperationMask:(NSDragOperation)mask; |
| (...skipping 1953 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2201 "2f3b ] 4b "); | 2202 "2f3b ] 4b "); |
| 2202 actual = bookmarks::test::ModelStringFromNode(root); | 2203 actual = bookmarks::test::ModelStringFromNode(root); |
| 2203 EXPECT_EQ(expected, actual); | 2204 EXPECT_EQ(expected, actual); |
| 2204 | 2205 |
| 2205 // Verify that the other bookmark folder can't be deleted. | 2206 // Verify that the other bookmark folder can't be deleted. |
| 2206 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; | 2207 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; |
| 2207 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); | 2208 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); |
| 2208 } | 2209 } |
| 2209 | 2210 |
| 2210 } // namespace | 2211 } // namespace |
| OLD | NEW |