chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm - Issue 10453101: Convert most of the rest of chrome to ImageSkia

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 10453101: Convert most of the rest of chrome to ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 6 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/task_manager/task_manager_worker_resource_provider.cc ('k') | chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.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 7ed17badebec4b9dd2b2645ef477ff727ad68fd8..897b74a8fd85d4a918dcfc42d0239006d9b0f663 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

@@ -178,11 +178,12 @@ TEST_F(BookmarkBarToolbarViewTest, DisplayAsDetachedBarWithBgImage) {

.WillRepeatedly(SetAlignLeft());

// Create a dummy bitmap full of not-red to blit with.

- SkBitmap fake_bg;

- fake_bg.setConfig(SkBitmap::kARGB_8888_Config, 800, 800);

- fake_bg.allocPixels();

- fake_bg.eraseColor(SK_ColorGREEN);

- EXPECT_CALL(provider, GetBitmapNamed(IDR_THEME_NTP_BACKGROUND))

+ SkBitmap fake_bg_bitmap;

+ fake_bg_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 800, 800);

+ fake_bg_bitmap.allocPixels();

+ fake_bg_bitmap.eraseColor(SK_ColorGREEN);

+ gfx::ImageSkia fake_bg(fake_bg_bitmap);

+ EXPECT_CALL(provider, GetImageSkiaNamed(IDR_THEME_NTP_BACKGROUND))

.WillRepeatedly(Return(&fake_bg));

[controller_.get() setThemeProvider:&provider];