Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(315)

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

Issue 9460039: ui/base: Remove the dependency in Profile from ThemeProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 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"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 dragDataNodes.push_back(dragDataNode_); 178 dragDataNodes.push_back(dragDataNode_);
179 } 179 }
180 return dragDataNodes; 180 return dragDataNodes;
181 } 181 }
182 182
183 @end 183 @end
184 184
185 185
186 class FakeTheme : public ui::ThemeProvider { 186 class FakeTheme : public ui::ThemeProvider {
187 public: 187 public:
188 FakeTheme(NSColor* color) : color_(color) { } 188 FakeTheme(NSColor* color) : color_(color) {}
189 scoped_nsobject<NSColor> color_; 189 scoped_nsobject<NSColor> color_;
190 190
191 virtual void Init(Profile* profile) { }
192 virtual SkBitmap* GetBitmapNamed(int id) const { return nil; } 191 virtual SkBitmap* GetBitmapNamed(int id) const { return nil; }
193 virtual SkColor GetColor(int id) const { return SkColor(); } 192 virtual SkColor GetColor(int id) const { return SkColor(); }
194 virtual bool GetDisplayProperty(int id, int* result) const { return false; } 193 virtual bool GetDisplayProperty(int id, int* result) const { return false; }
195 virtual bool ShouldUseNativeFrame() const { return false; } 194 virtual bool ShouldUseNativeFrame() const { return false; }
196 virtual bool HasCustomImage(int id) const { return false; } 195 virtual bool HasCustomImage(int id) const { return false; }
197 virtual RefCountedMemory* GetRawData(int id) const { return NULL; } 196 virtual RefCountedMemory* GetRawData(int id) const { return NULL; }
198 virtual NSImage* GetNSImageNamed(int id, bool allow_default) const { 197 virtual NSImage* GetNSImageNamed(int id, bool allow_default) const {
199 return nil; 198 return nil;
200 } 199 }
201 virtual NSColor* GetNSImageColorNamed(int id, bool allow_default) const { 200 virtual NSColor* GetNSImageColorNamed(int id, bool allow_default) const {
(...skipping 1980 matching lines...) Expand 10 before | Expand all | Expand 10 after
2182 "2f3b ] 4b "); 2181 "2f3b ] 4b ");
2183 actual = model_test_utils::ModelStringFromNode(root); 2182 actual = model_test_utils::ModelStringFromNode(root);
2184 EXPECT_EQ(expected, actual); 2183 EXPECT_EQ(expected, actual);
2185 2184
2186 // Verify that the other bookmark folder can't be deleted. 2185 // Verify that the other bookmark folder can't be deleted.
2187 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; 2186 BookmarkButton *otherButton = [bar_ otherBookmarksButton];
2188 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); 2187 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]);
2189 } 2188 }
2190 2189
2191 } // namespace 2190 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/themes/theme_service.h ('k') | chrome/browser/ui/cocoa/download/background_theme.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698