diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 04:30:59 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 04:30:59 +0000 |
| commit | 0a4e106b92bbaeea8f6d0b347c97d1089100db9a (patch) | |
| tree | dcfc95deeacc3a98a5f47542b1f802c5c8fa35ed /chrome/browser/ui | |
| parent | 33ddbd01cb88767afb10fecf9f98f2fdf76f9413 (diff) | |
| download | chromium_src-0a4e106b92bbaeea8f6d0b347c97d1089100db9a.zip chromium_src-0a4e106b92bbaeea8f6d0b347c97d1089100db9a.tar.gz chromium_src-0a4e106b92bbaeea8f6d0b347c97d1089100db9a.tar.bz2 | |
Fix check when converting favicon
BUG=117217
TEST=
Review URL: http://codereview.chromium.org/9629002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125552 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/views/create_application_shortcut_view.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 7caf2ea..b8f4168 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -249,7 +249,8 @@ CreateApplicationShortcutView::~CreateApplicationShortcutView() {} void CreateApplicationShortcutView::InitControls() { // Create controls app_info_ = new AppInfoView(shortcut_info_.title, shortcut_info_.description, - shortcut_info_.favicon); + shortcut_info_.favicon.IsEmpty() ? SkBitmap() : + *shortcut_info_.favicon.ToSkBitmap()); create_shortcuts_label_ = new views::Label( l10n_util::GetStringUTF16(IDS_CREATE_SHORTCUTS_LABEL)); create_shortcuts_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); @@ -436,7 +437,9 @@ bool CreateUrlApplicationShortcutView::Accept() { if (!CreateApplicationShortcutView::Accept()) return false; - tab_contents_->extension_tab_helper()->SetAppIcon(shortcut_info_.favicon); + tab_contents_->extension_tab_helper()->SetAppIcon( + shortcut_info_.favicon.IsEmpty() ? SkBitmap() : + *shortcut_info_.favicon.ToSkBitmap()); if (tab_contents_->web_contents()->GetDelegate()) { tab_contents_->web_contents()->GetDelegate()->ConvertContentsToApplication( tab_contents_->web_contents()); |