| 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 dragDataNodes.push_back(dragDataNode_); | 181 dragDataNodes.push_back(dragDataNode_); |
| 182 } | 182 } |
| 183 return dragDataNodes; | 183 return dragDataNodes; |
| 184 } | 184 } |
| 185 | 185 |
| 186 @end | 186 @end |
| 187 | 187 |
| 188 | 188 |
| 189 class FakeTheme : public ui::ThemeProvider { | 189 class FakeTheme : public ui::ThemeProvider { |
| 190 public: | 190 public: |
| 191 FakeTheme(NSColor* color) : color_(color) {} | 191 explicit FakeTheme(NSColor* color) : color_(color) {} |
| 192 scoped_nsobject<NSColor> color_; | 192 scoped_nsobject<NSColor> color_; |
| 193 | 193 |
| 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( | 199 virtual base::RefCountedMemory* GetRawData( |
| 200 int id, | 200 int id, |
| 201 ui::ScaleFactor scale_factor) const { | 201 ui::ScaleFactor scale_factor) const { |
| (...skipping 1966 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2168 "2f3b ] 4b "); | 2168 "2f3b ] 4b "); |
| 2169 actual = model_test_utils::ModelStringFromNode(root); | 2169 actual = model_test_utils::ModelStringFromNode(root); |
| 2170 EXPECT_EQ(expected, actual); | 2170 EXPECT_EQ(expected, actual); |
| 2171 | 2171 |
| 2172 // Verify that the other bookmark folder can't be deleted. | 2172 // Verify that the other bookmark folder can't be deleted. |
| 2173 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; | 2173 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; |
| 2174 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); | 2174 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); |
| 2175 } | 2175 } |
| 2176 | 2176 |
| 2177 } // namespace | 2177 } // namespace |
| OLD | NEW |