| 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 | 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/memory/scoped_nsobject.h" | 9 #include "base/memory/scoped_nsobject.h" |
| 10 #include "base/string16.h" | 10 #include "base/string16.h" |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 } | 198 } |
| 199 | 199 |
| 200 @end | 200 @end |
| 201 | 201 |
| 202 | 202 |
| 203 class FakeTheme : public ui::ThemeProvider { | 203 class FakeTheme : public ui::ThemeProvider { |
| 204 public: | 204 public: |
| 205 FakeTheme(NSColor* color) : color_(color) {} | 205 FakeTheme(NSColor* color) : color_(color) {} |
| 206 scoped_nsobject<NSColor> color_; | 206 scoped_nsobject<NSColor> color_; |
| 207 | 207 |
| 208 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const { return NULL; } | 208 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE { |
| 209 virtual SkColor GetColor(int id) const { return SkColor(); } | 209 return NULL; |
| 210 virtual bool GetDisplayProperty(int id, int* result) const { return false; } | 210 } |
| 211 virtual bool ShouldUseNativeFrame() const { return false; } | 211 virtual SkColor GetColor(int id) const OVERRIDE { return SkColor(); } |
| 212 virtual bool HasCustomImage(int id) const { return false; } | 212 virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE { |
| 213 return false; |
| 214 } |
| 215 virtual bool ShouldUseNativeFrame() const OVERRIDE { return false; } |
| 216 virtual bool HasCustomImage(int id) const OVERRIDE { return false; } |
| 213 virtual base::RefCountedMemory* GetRawData( | 217 virtual base::RefCountedMemory* GetRawData( |
| 214 int id, | 218 int id, |
| 215 ui::ScaleFactor scale_factor) const { | 219 ui::ScaleFactor scale_factor) const OVERRIDE { |
| 216 return NULL; | 220 return NULL; |
| 217 } | 221 } |
| 218 virtual NSImage* GetNSImageNamed(int id, bool allow_default) const { | 222 virtual NSImage* GetNSImageNamed(int id, bool allow_default) const OVERRIDE { |
| 219 return nil; | 223 return nil; |
| 220 } | 224 } |
| 221 virtual NSColor* GetNSImageColorNamed(int id, bool allow_default) const { | 225 virtual NSColor* GetNSImageColorNamed( |
| 226 int id, |
| 227 bool allow_default) const OVERRIDE { |
| 222 return nil; | 228 return nil; |
| 223 } | 229 } |
| 224 virtual NSColor* GetNSColor(int id, bool allow_default) const { | 230 virtual NSColor* GetNSColor(int id, bool allow_default) const OVERRIDE { |
| 225 return color_.get(); | 231 return color_.get(); |
| 226 } | 232 } |
| 227 virtual NSColor* GetNSColorTint(int id, bool allow_default) const { | 233 virtual NSColor* GetNSColorTint(int id, bool allow_default) const OVERRIDE { |
| 228 return nil; | 234 return nil; |
| 229 } | 235 } |
| 230 virtual NSGradient* GetNSGradient(int id) const { | 236 virtual NSGradient* GetNSGradient(int id) const OVERRIDE { |
| 231 return nil; | 237 return nil; |
| 232 } | 238 } |
| 233 }; | 239 }; |
| 234 | 240 |
| 235 | 241 |
| 236 @interface FakeDragInfo : NSObject { | 242 @interface FakeDragInfo : NSObject { |
| 237 @public | 243 @public |
| 238 NSPoint dropLocation_; | 244 NSPoint dropLocation_; |
| 239 NSDragOperation sourceMask_; | 245 NSDragOperation sourceMask_; |
| 240 } | 246 } |
| (...skipping 1940 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2181 "2f3b ] 4b "); | 2187 "2f3b ] 4b "); |
| 2182 actual = model_test_utils::ModelStringFromNode(root); | 2188 actual = model_test_utils::ModelStringFromNode(root); |
| 2183 EXPECT_EQ(expected, actual); | 2189 EXPECT_EQ(expected, actual); |
| 2184 | 2190 |
| 2185 // Verify that the other bookmark folder can't be deleted. | 2191 // Verify that the other bookmark folder can't be deleted. |
| 2186 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; | 2192 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; |
| 2187 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); | 2193 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); |
| 2188 } | 2194 } |
| 2189 | 2195 |
| 2190 } // namespace | 2196 } // namespace |
| OLD | NEW |