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