chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm - Issue 10388064: Add GetImageSkiaNamed to resource_bundle and theme_provider

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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

« chrome/browser/themes/theme_service.cc ('K') | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm » ('j') | chrome/browser/ui/cocoa/download/background_theme.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..e765d32f995b9e657963bc6a121c2f6f57d1ac1a 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 {

@@ -190,6 +191,7 @@ class FakeTheme : public ui::ThemeProvider {

scoped_nsobject<NSColor> color_;

virtual SkBitmap* GetBitmapNamed(int id) const { return nil; }

+ virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const { return nil; }

Robert Sesek 2012/05/10 12:28:35 Return NULL for C++ objects

virtual SkColor GetColor(int id) const { return SkColor(); }

virtual bool GetDisplayProperty(int id, int* result) const { return false; }

virtual bool ShouldUseNativeFrame() const { return false; }