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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
189 public: | 189 public: |
190 FakeTheme(NSColor* color) : color_(color) {} | 190 FakeTheme(NSColor* color) : color_(color) {} |
191 scoped_nsobject<NSColor> color_; | 191 scoped_nsobject<NSColor> color_; |
192 | 192 |
193 virtual SkBitmap* GetBitmapNamed(int id) const { return NULL; } | 193 virtual SkBitmap* GetBitmapNamed(int id) const { return NULL; } |
194 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const { return NULL; } | 194 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const { return NULL; } |
195 virtual SkColor GetColor(int id) const { return SkColor(); } | 195 virtual SkColor GetColor(int id) const { return SkColor(); } |
196 virtual bool GetDisplayProperty(int id, int* result) const { return false; } | 196 virtual bool GetDisplayProperty(int id, int* result) const { return false; } |
197 virtual bool ShouldUseNativeFrame() const { return false; } | 197 virtual bool ShouldUseNativeFrame() const { return false; } |
198 virtual bool HasCustomImage(int id) const { return false; } | 198 virtual bool HasCustomImage(int id) const { return false; } |
199 virtual base::RefCountedMemory* GetRawData(int id) const { return NULL; } | 199 virtual base::RefCountedMemory* GetRawData( |
| 200 int id, |
| 201 ui::ScaleFactor scale_factor) const { |
| 202 return NULL; |
| 203 } |
200 virtual NSImage* GetNSImageNamed(int id, bool allow_default) const { | 204 virtual NSImage* GetNSImageNamed(int id, bool allow_default) const { |
201 return nil; | 205 return nil; |
202 } | 206 } |
203 virtual NSColor* GetNSImageColorNamed(int id, bool allow_default) const { | 207 virtual NSColor* GetNSImageColorNamed(int id, bool allow_default) const { |
204 return nil; | 208 return nil; |
205 } | 209 } |
206 virtual NSColor* GetNSColor(int id, bool allow_default) const { | 210 virtual NSColor* GetNSColor(int id, bool allow_default) const { |
207 return color_.get(); | 211 return color_.get(); |
208 } | 212 } |
209 virtual NSColor* GetNSColorTint(int id, bool allow_default) const { | 213 virtual NSColor* GetNSColorTint(int id, bool allow_default) const { |
(...skipping 1977 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2187 "2f3b ] 4b "); | 2191 "2f3b ] 4b "); |
2188 actual = model_test_utils::ModelStringFromNode(root); | 2192 actual = model_test_utils::ModelStringFromNode(root); |
2189 EXPECT_EQ(expected, actual); | 2193 EXPECT_EQ(expected, actual); |
2190 | 2194 |
2191 // Verify that the other bookmark folder can't be deleted. | 2195 // Verify that the other bookmark folder can't be deleted. |
2192 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; | 2196 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; |
2193 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); | 2197 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); |
2194 } | 2198 } |
2195 | 2199 |
2196 } // namespace | 2200 } // namespace |
OLD | NEW |