| 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/mac/scoped_nsobject.h" | 9 #include "base/mac/scoped_nsobject.h" |
| 10 #include "base/strings/string16.h" | 10 #include "base/strings/string16.h" |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 } | 202 } |
| 203 | 203 |
| 204 @end | 204 @end |
| 205 | 205 |
| 206 | 206 |
| 207 class FakeTheme : public ui::ThemeProvider { | 207 class FakeTheme : public ui::ThemeProvider { |
| 208 public: | 208 public: |
| 209 FakeTheme(NSColor* color) : color_(color) {} | 209 FakeTheme(NSColor* color) : color_(color) {} |
| 210 base::scoped_nsobject<NSColor> color_; | 210 base::scoped_nsobject<NSColor> color_; |
| 211 | 211 |
| 212 virtual bool UsingNativeTheme() const OVERRIDE { | 212 virtual bool UsingSystemTheme() const OVERRIDE { |
| 213 return true; | 213 return true; |
| 214 } | 214 } |
| 215 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE { | 215 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE { |
| 216 return NULL; | 216 return NULL; |
| 217 } | 217 } |
| 218 virtual SkColor GetColor(int id) const OVERRIDE { return SkColor(); } | 218 virtual SkColor GetColor(int id) const OVERRIDE { return SkColor(); } |
| 219 virtual int GetDisplayProperty(int id) const OVERRIDE { | 219 virtual int GetDisplayProperty(int id) const OVERRIDE { |
| 220 return -1; | 220 return -1; |
| 221 } | 221 } |
| 222 virtual bool ShouldUseNativeFrame() const OVERRIDE { return false; } | 222 virtual bool ShouldUseNativeFrame() const OVERRIDE { return false; } |
| (...skipping 1851 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2074 "2f3b ] 4b "); | 2074 "2f3b ] 4b "); |
| 2075 actual = test::ModelStringFromNode(root); | 2075 actual = test::ModelStringFromNode(root); |
| 2076 EXPECT_EQ(expected, actual); | 2076 EXPECT_EQ(expected, actual); |
| 2077 | 2077 |
| 2078 // Verify that the other bookmark folder can't be deleted. | 2078 // Verify that the other bookmark folder can't be deleted. |
| 2079 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; | 2079 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; |
| 2080 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); | 2080 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); |
| 2081 } | 2081 } |
| 2082 | 2082 |
| 2083 } // namespace | 2083 } // namespace |
| OLD | NEW |