chrome/browser/ui/gtk/browser_titlebar.cc - Issue 64853004: Use high resolution icons where possible for streamlined hosted app icons.

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/gtk/browser_titlebar.cc

Issue 64853004: Use high resolution icons where possible for streamlined hosted app icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@browser_experiment_create_app_from_page

Patch Set: rework, add tests Created 7 years, 1 month 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/browser.cc ('K') | « chrome/browser/ui/browser_tab_contents.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | chrome/browser/ui/views/frame/browser_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/browser_titlebar.cc

diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc

index 1bea5c143a4823f10a39913e0711c34a929b339d..909545b0b22fc281ec41c3f73c543413e766ddd5 100644

--- a/chrome/browser/ui/gtk/browser_titlebar.cc

+++ b/chrome/browser/ui/gtk/browser_titlebar.cc

@@ -614,11 +614,12 @@ void BrowserTitlebar::UpdateTitleAndIcon() {

// top left of the custom frame, that will get updated when the

// throbber is updated.

Profile* profile = browser_window_->browser()->profile();

- gfx::Image icon = browser_window_->browser()->GetCurrentPageIcon();

- if (icon.IsEmpty()) {

+ const gfx::Image* icon = browser_window_->browser()->GetCurrentPageIcon(

+ IconUtil::kMediumIconSize);

+ if (!icon || icon->IsEmpty()) {

gtk_util::SetWindowIcon(window_, profile);

} else {

- gtk_util::SetWindowIcon(window_, profile, icon.ToGdkPixbuf());

+ gtk_util::SetWindowIcon(window_, profile, icon->ToGdkPixbuf());

}

break;

}