chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm - 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/cocoa/location_bar/content_setting_decoration.mm

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: No real need for the other #defines either.. 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

« no previous file with comments | « no previous file | chrome/browser/ui/content_settings/content_setting_image_model.h » ('j') | chrome/browser/ui/content_settings/content_setting_image_model.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

index 470e4df8548d8bde6f1175270f0e5e3b41b4ebad..194bed68d3b4d1bac49b43708b19a2d7da7002a7 100644

--- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

+++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

@@ -175,13 +175,14 @@ ContentSettingDecoration::~ContentSettingDecoration() {

bool ContentSettingDecoration::UpdateFromWebContents(

WebContents* web_contents) {

bool was_visible = IsVisible();

- int old_icon = content_setting_image_model_->icon_id();

+ int old_icon = content_setting_image_model_->raster_icon_id();

content_setting_image_model_->UpdateFromWebContents(web_contents);

SetVisible(content_setting_image_model_->is_visible());

- bool decoration_changed = was_visible != IsVisible() ||

- old_icon != content_setting_image_model_->icon_id();

+ bool decoration_changed =

+ was_visible != IsVisible() ||

+ old_icon != content_setting_image_model_->raster_icon_id();

if (IsVisible()) {

- SetImage(content_setting_image_model_->icon().ToNSImage());

+ SetImage(content_setting_image_model_->raster_icon().ToNSImage());

SetToolTip(

base::SysUTF16ToNSString(content_setting_image_model_->get_tooltip()));