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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

Issue 10388064: Add GetImageSkiaNamed to resource_bundle and theme_provider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed nits Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index a1a09854deea2b804501bc9cc2d3e9e9f11ef371..1193f8996b4247e1c4ab0bf62a9eb64e95a70c2b 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -33,6 +33,7 @@
#import "third_party/ocmock/OCMock/OCMock.h"
#include "ui/base/test/cocoa_test_event_utils.h"
#include "ui/base/theme_provider.h"
+#include "ui/gfx/image/image_skia.h"
// Unit tests don't need time-consuming asynchronous animations.
@interface BookmarkBarControllerTestable : BookmarkBarController {
@@ -189,7 +190,8 @@ class FakeTheme : public ui::ThemeProvider {
FakeTheme(NSColor* color) : color_(color) {}
scoped_nsobject<NSColor> color_;
- virtual SkBitmap* GetBitmapNamed(int id) const { return nil; }
+ virtual SkBitmap* GetBitmapNamed(int id) const { return NULL; }
+ virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const { return NULL; }
virtual SkColor GetColor(int id) const { return SkColor(); }
virtual bool GetDisplayProperty(int id, int* result) const { return false; }
virtual bool ShouldUseNativeFrame() const { return false; }
« no previous file with comments | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698