chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc - Issue 1482183002: Fix content_setting_image_view compile on mac_views_browser

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/content_settings/content_setting_image_model_unittest.cc

Issue 1482183002: Fix content_setting_image_view compile on mac_views_browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Hide raster icons on non-Mac Created 5 years 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/ui/content_settings/content_setting_image_model.cc ('K') | « chrome/browser/ui/content_settings/content_setting_image_model.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

index 8ff6be80733199a9950fc6ff83a0e331a990bd17..ac38fecaadf2a0d3109e3fa78ac4ff96b40baea9 100644

--- a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

+++ b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

@@ -23,11 +23,7 @@

namespace {

bool HasIcon(const ContentSettingImageModel& model) {

-#if defined(OS_MACOSX)

- return !model.icon().IsEmpty();

-#else

return !model.GetIcon(gfx::kPlaceholderColor).IsEmpty();

-#endif

}

// Forward all NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED to the specified