diff options
| author | meacer <meacer@chromium.org> | 2015-04-09 14:29:24 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-09 21:31:05 +0000 |
| commit | 1043503c471a5ca48e685341cabf44530b968312 (patch) | |
| tree | e1495e5143bbbce6fd02c136ad5b4287dd82adf3 | |
| parent | 02feadf69982e02fde600835b9ac52b4baa9b4e5 (diff) | |
| download | chromium_src-1043503c471a5ca48e685341cabf44530b968312.zip chromium_src-1043503c471a5ca48e685341cabf44530b968312.tar.gz chromium_src-1043503c471a5ca48e685341cabf44530b968312.tar.bz2 | |
Use ImageView instead of Favicon in content settings UI for non-link images.
BUG=475505
Review URL: https://codereview.chromium.org/1071303002
Cr-Commit-Position: refs/heads/master@{#324509}
| -rw-r--r-- | chrome/browser/ui/views/content_setting_bubble_contents.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc index 7d18728..88ccb98 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents.cc +++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc @@ -237,10 +237,10 @@ void ContentSettingBubbleContents::Init() { layout->AddView(new Favicon(list_item.image, this, link)); layout->AddView(link); } else { - views::Label* label = - new views::Label(base::UTF8ToUTF16(list_item.title)); - layout->AddView(new Favicon(list_item.image, this, NULL)); - layout->AddView(label); + views::ImageView* icon = new views::ImageView(); + icon->SetImage(list_item.image.AsImageSkia()); + layout->AddView(icon); + layout->AddView(new views::Label(base::UTF8ToUTF16(list_item.title))); } row++; bubble_content_empty = false; |