diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-05 15:22:25 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-05 15:22:44 +0200 |
| commit | 4f62685dfa09d64a8fcd2de9ed0adb7fe5747b78 (patch) | |
| tree | 9dc9c3ba8ab461f7ee3d444222246be5ed55ae3f /chromium/extensions/browser/app_window/app_window.cc | |
| parent | 19de26b7efd6b993f2af26cf435f04c716d3f5bc (diff) | |
| parent | bb09965444b5bb20b096a291445170876225268d (diff) | |
| download | qtwebengine-chromium-4f62685dfa09d64a8fcd2de9ed0adb7fe5747b78.tar.gz | |
Merge branch 'upstream-master' into 58-based
Change-Id: I8c280ca9068fdda9cf6276725bfb8608eccb497a
Diffstat (limited to 'chromium/extensions/browser/app_window/app_window.cc')
| -rw-r--r-- | chromium/extensions/browser/app_window/app_window.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chromium/extensions/browser/app_window/app_window.cc b/chromium/extensions/browser/app_window/app_window.cc index 69126c3436a..fe70056fd01 100644 --- a/chromium/extensions/browser/app_window/app_window.cc +++ b/chromium/extensions/browser/app_window/app_window.cc @@ -561,6 +561,10 @@ base::string16 AppWindow::GetTitle() const { return title; } +bool AppWindow::HasCustomIcon() const { + return window_icon_url_.is_valid() || app_icon_url_.is_valid(); +} + void AppWindow::SetAppIconUrl(const GURL& url) { // Avoid using any previous icons that were being downloaded. image_loader_ptr_factory_.InvalidateWeakPtrs(); @@ -595,7 +599,8 @@ void AppWindow::UpdateAppIcon(const gfx::Image& image) { // Set the showInShelf=true window icon and add the app_icon_image_ // as a badge. If the image is empty, set the default app icon placeholder // as the base image. - if (window_icon_url_.is_valid() && !app_icon_image_->image().IsEmpty()) { + if (window_icon_url_.is_valid() && app_icon_image_ && + !app_icon_image_->image().IsEmpty()) { gfx::Image base_image = !image.IsEmpty() ? image |