chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_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_toolbar_view_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

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/download/background_theme.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm

index 6b4654f40b225a0f683235b7a7c6ad24ed571ddd..7ed17badebec4b9dd2b2645ef477ff727ad68fd8 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm

@@ -16,6 +16,7 @@

#include "third_party/skia/include/core/SkBitmap.h"

#include "third_party/skia/include/core/SkColor.h"

#include "ui/base/theme_provider.h"

+#include "ui/gfx/image/image_skia.h"

using ::testing::_;

using ::testing::DoAll;

@@ -29,6 +30,7 @@ class MockThemeProvider : public ui::ThemeProvider {

// Cross platform methods

MOCK_METHOD1(Init, void(Profile*));

MOCK_CONST_METHOD1(GetBitmapNamed, SkBitmap*(int));

+ MOCK_CONST_METHOD1(GetImageSkiaNamed, gfx::ImageSkia*(int));

MOCK_CONST_METHOD1(GetColor, SkColor(int));

MOCK_CONST_METHOD2(GetDisplayProperty, bool(int, int*));

MOCK_CONST_METHOD0(ShouldUseNativeFrame, bool());